From ec123412ee5e7b00008c85892c16e40357557364 Mon Sep 17 00:00:00 2001 From: hbr <1991483710@qq.com> Date: Sun, 9 Jun 2024 20:26:19 +0800 Subject: [PATCH] =?UTF-8?q?feat:mybatis=20Plus=20=E8=81=94=E8=A1=A8?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- zhiLian-business/pom.xml | 6 +- zhiLian-business/zhiLian-data-plus/pom.xml | 19 ++++++ zhiLian-business/zhiLian-data-service/pom.xml | 10 ++++ .../com/zhiLian/business/Job/ManyJob.java | 2 +- .../controller/EntinfoController.java | 14 +++++ .../business/controller/PlusController.java | 15 +++++ .../com/zhiLian/business/domain/Cart.java | 35 +++++++++++ .../com/zhiLian/business/domain/CartVo.java | 30 ++++++++++ .../com/zhiLian/business/domain/Type.java | 31 ++++++++++ .../business/mapper/BusinessMapper.java | 2 - .../zhiLian/business/mapper/PlusMapper.java | 19 ++++++ .../zhiLian/business/mapper/TypeMapper.java | 20 +++++++ .../zhiLian/business/service/PlusService.java | 19 ++++++ .../service/impl/BusinessServiceImpl.java | 19 +++--- .../service/impl/PlusServiceImpl.java | 58 +++++++++++++++++++ .../src/main/resources/bootstrap.yml | 2 +- .../vehicle/datasource/ManyDataSource.java | 2 +- .../contents/DatasourceContent.java | 2 +- .../java/com/zhiLian/vehicle/domain/Type.java | 31 ++++++++++ .../zhiLian/vehicle/domain/vo/VehicleVo.java | 54 +++++++++++++++++ .../src/main/resources/bootstrap.yml | 2 +- 21 files changed, 374 insertions(+), 18 deletions(-) create mode 100644 zhiLian-business/zhiLian-data-plus/pom.xml create mode 100644 zhiLian-business/zhiLian-data-service/src/main/java/com/zhiLian/business/controller/PlusController.java create mode 100644 zhiLian-business/zhiLian-data-service/src/main/java/com/zhiLian/business/domain/Cart.java create mode 100644 zhiLian-business/zhiLian-data-service/src/main/java/com/zhiLian/business/domain/CartVo.java create mode 100644 zhiLian-business/zhiLian-data-service/src/main/java/com/zhiLian/business/domain/Type.java create mode 100644 zhiLian-business/zhiLian-data-service/src/main/java/com/zhiLian/business/mapper/PlusMapper.java create mode 100644 zhiLian-business/zhiLian-data-service/src/main/java/com/zhiLian/business/mapper/TypeMapper.java create mode 100644 zhiLian-business/zhiLian-data-service/src/main/java/com/zhiLian/business/service/PlusService.java create mode 100644 zhiLian-business/zhiLian-data-service/src/main/java/com/zhiLian/business/service/impl/PlusServiceImpl.java create mode 100644 zhiLian-vehicle/zhiLian-vehicle-service/src/main/java/com/zhiLian/vehicle/domain/Type.java create mode 100644 zhiLian-vehicle/zhiLian-vehicle-service/src/main/java/com/zhiLian/vehicle/domain/vo/VehicleVo.java diff --git a/zhiLian-business/pom.xml b/zhiLian-business/pom.xml index 0a0b7d4..7792f05 100644 --- a/zhiLian-business/pom.xml +++ b/zhiLian-business/pom.xml @@ -10,6 +10,10 @@ zhiLian-business + pom + + zhiLian-data-plus + 17 @@ -19,7 +23,5 @@ zhiLian-business系统模块 - - diff --git a/zhiLian-business/zhiLian-data-plus/pom.xml b/zhiLian-business/zhiLian-data-plus/pom.xml new file mode 100644 index 0000000..82a98d2 --- /dev/null +++ b/zhiLian-business/zhiLian-data-plus/pom.xml @@ -0,0 +1,19 @@ + + + 4.0.0 + + com.zhiLian + zhiLian-business + 3.6.3 + + + zhiLian-data-plus + + + 17 + 17 + UTF-8 + + diff --git a/zhiLian-business/zhiLian-data-service/pom.xml b/zhiLian-business/zhiLian-data-service/pom.xml index 7be99e2..e148732 100644 --- a/zhiLian-business/zhiLian-data-service/pom.xml +++ b/zhiLian-business/zhiLian-data-service/pom.xml @@ -20,6 +20,16 @@ UTF-8 + + com.github.yulichang + mybatis-plus-join + 1.2.4 + + + com.baomidou + mybatis-plus-boot-starter + 3.5.1 + org.springframework.boot 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 1054fd7..30a8438 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 @@ -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 list = entinfoService.list(); 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 dcd38e2..d472ed5 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 @@ -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 list = plusService.list(); + System.out.println(list); + return plusService.cartList(); + } + /** * 查询多数据源列表 */ diff --git a/zhiLian-business/zhiLian-data-service/src/main/java/com/zhiLian/business/controller/PlusController.java b/zhiLian-business/zhiLian-data-service/src/main/java/com/zhiLian/business/controller/PlusController.java new file mode 100644 index 0000000..ce08653 --- /dev/null +++ b/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{ +} diff --git a/zhiLian-business/zhiLian-data-service/src/main/java/com/zhiLian/business/domain/Cart.java b/zhiLian-business/zhiLian-data-service/src/main/java/com/zhiLian/business/domain/Cart.java new file mode 100644 index 0000000..a272f21 --- /dev/null +++ b/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; +} diff --git a/zhiLian-business/zhiLian-data-service/src/main/java/com/zhiLian/business/domain/CartVo.java b/zhiLian-business/zhiLian-data-service/src/main/java/com/zhiLian/business/domain/CartVo.java new file mode 100644 index 0000000..fbd6025 --- /dev/null +++ b/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; +} diff --git a/zhiLian-business/zhiLian-data-service/src/main/java/com/zhiLian/business/domain/Type.java b/zhiLian-business/zhiLian-data-service/src/main/java/com/zhiLian/business/domain/Type.java new file mode 100644 index 0000000..7e41e41 --- /dev/null +++ b/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; +} diff --git a/zhiLian-business/zhiLian-data-service/src/main/java/com/zhiLian/business/mapper/BusinessMapper.java b/zhiLian-business/zhiLian-data-service/src/main/java/com/zhiLian/business/mapper/BusinessMapper.java index ef8c521..30a8117 100644 --- a/zhiLian-business/zhiLian-data-service/src/main/java/com/zhiLian/business/mapper/BusinessMapper.java +++ b/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 diff --git a/zhiLian-business/zhiLian-data-service/src/main/java/com/zhiLian/business/mapper/PlusMapper.java b/zhiLian-business/zhiLian-data-service/src/main/java/com/zhiLian/business/mapper/PlusMapper.java new file mode 100644 index 0000000..8a838de --- /dev/null +++ b/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 { +} diff --git a/zhiLian-business/zhiLian-data-service/src/main/java/com/zhiLian/business/mapper/TypeMapper.java b/zhiLian-business/zhiLian-data-service/src/main/java/com/zhiLian/business/mapper/TypeMapper.java new file mode 100644 index 0000000..4f63156 --- /dev/null +++ b/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 { +} diff --git a/zhiLian-business/zhiLian-data-service/src/main/java/com/zhiLian/business/service/PlusService.java b/zhiLian-business/zhiLian-data-service/src/main/java/com/zhiLian/business/service/PlusService.java new file mode 100644 index 0000000..25313ca --- /dev/null +++ b/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 { + Result cartList(); + +} 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 b9cb106..add2d6c 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 @@ -186,21 +186,22 @@ public class BusinessServiceImpl extends ServiceImpl 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; + } ); + } /** diff --git a/zhiLian-business/zhiLian-data-service/src/main/java/com/zhiLian/business/service/impl/PlusServiceImpl.java b/zhiLian-business/zhiLian-data-service/src/main/java/com/zhiLian/business/service/impl/PlusServiceImpl.java new file mode 100644 index 0000000..01f9cdd --- /dev/null +++ b/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 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); +// return Result.success(cartList); + + +// MPJLambdaWrapper mpjLambdaWrapper1 = new MPJLambdaWrapper<>(); +// MPJLambdaWrapper lambdaWrapper = mpjLambdaWrapper1.eq(Cart::getId, "1"); + 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/zhiLian-business/zhiLian-data-service/src/main/resources/bootstrap.yml b/zhiLian-business/zhiLian-data-service/src/main/resources/bootstrap.yml index 90bbf83..c09b354 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: 192.168.120.128 + host: 122.51.111.225 listener: simple: prefetch: 1 # 每次只能获取一条，处理完成才能获取下一条 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 0413857..86be14a 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 @@ -90,7 +90,7 @@ public class ManyDataSource { } } catch (Exception e) { //删除队列ID - log.info("消费重复"); + log.info("消费失败"); try { //回退消息 channel.basicReject(message.getMessageProperties().getDeliveryTag(),true); diff --git a/zhiLian-vehicle/zhiLian-vehicle-service/src/main/java/com/zhiLian/vehicle/datasource/contents/DatasourceContent.java b/zhiLian-vehicle/zhiLian-vehicle-service/src/main/java/com/zhiLian/vehicle/datasource/contents/DatasourceContent.java index 02589ac..9013b11 100644 --- a/zhiLian-vehicle/zhiLian-vehicle-service/src/main/java/com/zhiLian/vehicle/datasource/contents/DatasourceContent.java +++ b/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"; diff --git a/zhiLian-vehicle/zhiLian-vehicle-service/src/main/java/com/zhiLian/vehicle/domain/Type.java b/zhiLian-vehicle/zhiLian-vehicle-service/src/main/java/com/zhiLian/vehicle/domain/Type.java new file mode 100644 index 0000000..3a0805c --- /dev/null +++ b/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; +} diff --git a/zhiLian-vehicle/zhiLian-vehicle-service/src/main/java/com/zhiLian/vehicle/domain/vo/VehicleVo.java b/zhiLian-vehicle/zhiLian-vehicle-service/src/main/java/com/zhiLian/vehicle/domain/vo/VehicleVo.java new file mode 100644 index 0000000..27f89a3 --- /dev/null +++ b/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; + +} 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 f027ec5..36dd436 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: 192.168.120.128 + host: 122.51.111.225 listener: simple: prefetch: 1 # 每次只能获取一条，处理完成才能获取下一条