From aa8d06e57d0e6f9d797b58d4c01138d56049e4cf 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:=E9=A1=B9=E7=9B=AE=E4=BC=98=E5=8C=96?= =?UTF-8?q?=EF=BC=8C=E7=BB=86=E8=8A=82=E5=A4=84=E7=90=86?= 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 +- .../business/config/RabbitmqConfig.java | 1 + .../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 - .../business/mapper/EntinfoMapper.java | 2 + .../zhiLian/business/mapper/PlusMapper.java | 19 ++++++ .../zhiLian/business/mapper/TypeMapper.java | 20 ++++++ .../business/service/IEntinfoService.java | 3 + .../zhiLian/business/service/PlusService.java | 19 ++++++ .../service/impl/BusinessServiceImpl.java | 42 +++++++----- .../service/impl/EntinfoServiceImpl.java | 6 ++ .../service/impl/PlusServiceImpl.java | 57 ++++++++++++++++ .../src/main/resources/bootstrap.yml | 2 +- .../mapper/entInfo/EntinfoMapper.xml | 8 +++ .../system/remote/RemoteUserService.java | 5 ++ .../factory/RemoteUserFallbackFactory.java | 10 +++ .../system/controller/SysUserController.java | 11 +++ .../zhiLian/system/mapper/SysUserMapper.java | 4 ++ .../system/service/SysUserService.java | 5 ++ .../service/impl/SysUserServiceImpl.java | 18 ++++- .../resources/mapper/system/SysUserMapper.xml | 9 +++ .../vehicle/datasource/ManyDataSource.java | 67 +++++++++++-------- .../factory/DruidDataSourceFactory.java | 13 ++-- .../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 +- 34 files changed, 511 insertions(+), 63 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/config/RabbitmqConfig.java b/zhiLian-business/zhiLian-data-service/src/main/java/com/zhiLian/business/config/RabbitmqConfig.java index 73360e6..56aa53e 100644 --- a/zhiLian-business/zhiLian-data-service/src/main/java/com/zhiLian/business/config/RabbitmqConfig.java +++ b/zhiLian-business/zhiLian-data-service/src/main/java/com/zhiLian/business/config/RabbitmqConfig.java @@ -10,6 +10,7 @@ public class RabbitmqConfig { // 消息转换配置 @Bean public MessageConverter jsonMessageConverter() { + // 使用json序列化方式，进行消息转换 return new Jackson2JsonMessageConverter(); } } 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..c53190a --- /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..71ca292 --- /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/EntinfoMapper.java b/zhiLian-business/zhiLian-data-service/src/main/java/com/zhiLian/business/mapper/EntinfoMapper.java index 9c46a11..9c36a2a 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 @@ -60,4 +60,6 @@ public interface EntinfoMapper extends BaseMapper * @return 结果 */ public int deleteEntinfoByIds(Long[] ids); + + Entinfo selectEntinfo(Entinfo business); } 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/IEntinfoService.java b/zhiLian-business/zhiLian-data-service/src/main/java/com/zhiLian/business/service/IEntinfoService.java index a456cb3..f749836 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,6 +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 java.util.List; @@ -60,4 +61,6 @@ public interface IEntinfoService extends IService * @return 结果 */ public int deleteEntinfoById(Long id); + + Entinfo selectEntinfo(Entinfo business); } 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..552de94 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,7 +108,7 @@ public class BusinessServiceImpl extends ServiceImpl .email(business.getBusinessEmail()) .phonenumber(business.getBusinessPhone()) .loginIp("111.229.102.61") - .roleId(Long.valueOf(2)) + .roleId(Long.valueOf(101)) .userType(String.valueOf(business.getId())) .build(); Result add = remoteUserService.add(sysUser); @@ -139,11 +139,22 @@ public class BusinessServiceImpl extends ServiceImpl public void httpConnectMysql(Business business){ redisService.deleteObject("entinfo"); List list = entinfoService.list(); - redisService.setCacheList("entinfo",list); - if (business.getBusinessStates().equals("2")) { - extracted(business); + if(list.size()!=0){ + redisService.setCacheList("entinfo",list); + } + if (business.getBusinessStates().equals("2")) { + SysUser sysUser = remoteUserService.userById(business.getId()); + sysUser.setRoleId(Long.valueOf(2)); + remoteUserService.updateById(sysUser); + Entinfo build = Entinfo.builder() + .entCode("test_" + business.getId()) + .ip("192.168.120.128") + .port(Integer.valueOf(3306 + Integer.valueOf(String.valueOf(business.getId())))).build(); + Entinfo entinfo =entinfoService.selectEntinfo(build); + if (entinfo==null){ + extracted(business); + } } - } @Autowired @@ -159,7 +170,6 @@ public class BusinessServiceImpl extends ServiceImpl hashMap.put("businessId",business.getId()+ business.getName()); hashMap.put("mysqlPort",String.valueOf(3306+ business.getId())); String json = JSON.toJSONString(hashMap); - // 3.创建连接与设置连接参数 URL urlObj = null; try { @@ -186,21 +196,21 @@ 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/EntinfoServiceImpl.java b/zhiLian-business/zhiLian-data-service/src/main/java/com/zhiLian/business/service/impl/EntinfoServiceImpl.java index fc1bd5e..d376256 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,6 +3,7 @@ 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; @@ -93,4 +94,9 @@ public class EntinfoServiceImpl extends ServiceImpl { return entinfoMapper.deleteEntinfoById(id); } + + @Override + public Entinfo selectEntinfo(Entinfo business) { + return entinfoMapper.selectEntinfo(business); + } } 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..6ed9028 --- /dev/null +++ b/zhiLian-business/zhiLian-data-service/src/main/java/com/zhiLian/business/service/impl/PlusServiceImpl.java @@ -0,0 +1,57 @@ +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..0499dfb 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: 111.229.102.61 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 675678c..0a1cda3 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 @@ -28,6 +28,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} + insert into entinfo diff --git a/zhiLian-common/zhiLian-common-system/src/main/java/com/zhiLian/common/system/remote/RemoteUserService.java b/zhiLian-common/zhiLian-common-system/src/main/java/com/zhiLian/common/system/remote/RemoteUserService.java index 108cc02..a88aa5a 100644 --- a/zhiLian-common/zhiLian-common-system/src/main/java/com/zhiLian/common/system/remote/RemoteUserService.java +++ b/zhiLian-common/zhiLian-common-system/src/main/java/com/zhiLian/common/system/remote/RemoteUserService.java @@ -50,4 +50,9 @@ public interface RemoteUserService { @GetMapping("/user/selectByUserId/{userId}") public SysUser selectByUserId (@PathVariable("userId") Long userId); + + @GetMapping("/user/userById/{userId}") + public SysUser userById (@PathVariable("userId") Long UserType); + @PostMapping("/user/updateById") + public Result updateById (@RequestBody SysUser user); } diff --git a/zhiLian-common/zhiLian-common-system/src/main/java/com/zhiLian/common/system/remote/factory/RemoteUserFallbackFactory.java b/zhiLian-common/zhiLian-common-system/src/main/java/com/zhiLian/common/system/remote/factory/RemoteUserFallbackFactory.java index db93ce5..8452d7c 100644 --- a/zhiLian-common/zhiLian-common-system/src/main/java/com/zhiLian/common/system/remote/factory/RemoteUserFallbackFactory.java +++ b/zhiLian-common/zhiLian-common-system/src/main/java/com/zhiLian/common/system/remote/factory/RemoteUserFallbackFactory.java @@ -51,6 +51,16 @@ public class RemoteUserFallbackFactory implements FallbackFactory { * @return 结果 */ public SysUser checkEmailUnique (String email); + + void updateByUserId(SysUser user); + + SysUser selectUserByUserType(String userType); } diff --git a/zhiLian-modules/zhiLian-modules-system/src/main/java/com/zhiLian/system/service/SysUserService.java b/zhiLian-modules/zhiLian-modules-system/src/main/java/com/zhiLian/system/service/SysUserService.java index 2c2544d..1937663 100644 --- a/zhiLian-modules/zhiLian-modules-system/src/main/java/com/zhiLian/system/service/SysUserService.java +++ b/zhiLian-modules/zhiLian-modules-system/src/main/java/com/zhiLian/system/service/SysUserService.java @@ -2,6 +2,7 @@ package com.zhiLian.system.service; import com.baomidou.mybatisplus.extension.service.IService; import com.zhiLian.common.system.domain.SysUser; +import org.apache.catalina.User; import java.util.List; @@ -225,4 +226,8 @@ public interface SysUserService extends IService { * @return 结果 */ public String importUser (List userList, Boolean isUpdateSupport, String operName); + + String updateByUserId(SysUser user); + + SysUser selectUserByUserType(Long userType); } 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 685c0c5..ddf2b4a 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 @@ -16,6 +16,7 @@ import com.zhiLian.system.domain.SysUserRole; import com.zhiLian.system.mapper.*; import com.zhiLian.system.service.SysUserService; import com.zhiLian.system.service.SysConfigService; +import org.apache.catalina.User; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -241,9 +242,9 @@ public class SysUserServiceImpl extends ServiceImpl impl // 新增用户岗位关联 insertUserPost(user); // 新增用户与角色管理 - if (2 == user.getRoleId()){ + if (101 == user.getRoleId()){ SysUserRole sysUserRole = new SysUserRole(); - sysUserRole.setRoleId(Long.valueOf(2)); + sysUserRole.setRoleId(Long.valueOf(101)); sysUserRole.setUserId(user.getUserId()); userRoleMapper.insertUserRole(sysUserRole); } @@ -506,4 +507,17 @@ public class SysUserServiceImpl extends ServiceImpl impl return successMsg.toString(); } + @Override + public String updateByUserId(SysUser user) { + userMapper.updateByUserId(user); + return null; + } + + @Override + public SysUser selectUserByUserType(Long userType) { + String userType1=String.valueOf(userType); + SysUser user = userMapper.selectUserByUserType(userType1); + return user; + } + } diff --git a/zhiLian-modules/zhiLian-modules-system/src/main/resources/mapper/system/SysUserMapper.xml b/zhiLian-modules/zhiLian-modules-system/src/main/resources/mapper/system/SysUserMapper.xml index 47383fb..20ad890 100644 --- a/zhiLian-modules/zhiLian-modules-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/zhiLian-modules/zhiLian-modules-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -185,6 +185,12 @@ and del_flag = '0' limit 1 + + insert into sys_user( @@ -259,6 +265,9 @@ set password = #{password} where user_name = #{userName} + + update sys_user_role set role_id = #{roleId} where user_id = #{userId} + update sys_user 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..d5e72eb 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 @@ -41,6 +41,21 @@ import java.util.Map; 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; @@ -52,6 +67,13 @@ public class ManyDataSource { @RabbitListener(queuesToDeclare = {@Queue(name = "zhiLian-vehicle-exchange")}) public void smsConfig(String msg, Message message, Channel channel){ //获取消息的ID +// new Thread(() -> { +// try { +// Thread.sleep(10000); +// } catch (InterruptedException e) { +// throw new RuntimeException(e); +// } +// }).start(); String messageId = message.getMessageProperties().getMessageId(); try { //添加消息id到redis set集合中 添加成功返回1 表示未消费 添加失败返回0 表示已消费 @@ -59,41 +81,17 @@ public class ManyDataSource { //添加成功 正常消费信息 if (count == 1) { log.info("开始消费"); - DruidDataSourceFactory druidDataSourceFactory = SpringUtils.getBean(DruidDataSourceFactory.class); - DynamicDataSource dynamicDataSource = SpringUtils.getBean(DynamicDataSource.class); - Entinfo entinfo1 = JSON.parseObject(msg, Entinfo.class); - DataSourceInfo dataSourceInfo = DataSourceInfo.hostAndPortBuild(entinfo1.getEntCode(), entinfo1.getIp(), entinfo1.getPort()); - DruidDataSource druidDataSource = druidDataSourceFactory.create(dataSourceInfo); - dynamicDataSource.put(dataSourceInfo.getKey(), druidDataSource); - new Thread(() -> { - try { - Thread.sleep(10000); - } catch (InterruptedException e) { - throw new RuntimeException(e); - } - -// List entinfo = redisTemplate.opsForList().range("entinfo", 0, -1); -// List databaseNameList = new ArrayList<>(); -// entinfo.forEach(string -> { -// Entinfo entInfo = JSON.parseObject(string, Entinfo.class); -// databaseNameList.add(entInfo); -// }); -// databaseNameList.forEach(enterpriseInfo -> { -// DataSourceInfo dataSourceInfo = DataSourceInfo.hostAndPortBuild(enterpriseInfo.getEntCode(), enterpriseInfo.getIp(), enterpriseInfo.getPort()); -// DruidDataSource druidDataSource = druidDataSourceFactory.create(dataSourceInfo); -// dynamicDataSource.put(dataSourceInfo.getKey(), druidDataSource); -// }); - }).start(); + druidData(msg); //确认消费 channel.basicAck(message.getMessageProperties().getDeliveryTag(),false); log.info("消费成功"); } } catch (Exception e) { - //删除队列ID - log.info("消费重复"); + log.info("消费失败，尝试重连"); try { - //回退消息 - channel.basicReject(message.getMessageProperties().getDeliveryTag(),true); + //回退消息,尝试重连 + druidData(msg); + channel.basicReject(message.getMessageProperties().getDeliveryTag(),false); log.info("消费失败"); } catch (IOException ex) { //回退失败 @@ -102,6 +100,17 @@ 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()); + DruidDataSource druidDataSource = druidDataSourceFactory.create(dataSourceInfo); + dynamicDataSource.put(dataSourceInfo.getKey(), druidDataSource); + } + @Lazy private List dataSourceInfoList(){ List databaseNameList = new ArrayList<>(){{ diff --git a/zhiLian-vehicle/zhiLian-vehicle-service/src/main/java/com/zhiLian/vehicle/datasource/config/factory/DruidDataSourceFactory.java b/zhiLian-vehicle/zhiLian-vehicle-service/src/main/java/com/zhiLian/vehicle/datasource/config/factory/DruidDataSourceFactory.java index b3122ba..f4a0966 100644 --- a/zhiLian-vehicle/zhiLian-vehicle-service/src/main/java/com/zhiLian/vehicle/datasource/config/factory/DruidDataSourceFactory.java +++ b/zhiLian-vehicle/zhiLian-vehicle-service/src/main/java/com/zhiLian/vehicle/datasource/config/factory/DruidDataSourceFactory.java @@ -2,6 +2,7 @@ package com.zhiLian.vehicle.datasource.config.factory; import com.alibaba.druid.pool.DruidDataSource; +import com.alibaba.druid.pool.DruidPooledConnection; import com.zhiLian.vehicle.datasource.domain.DataSourceInfo; import lombok.extern.log4j.Log4j2; import org.springframework.stereotype.Component; @@ -31,13 +32,9 @@ public class DruidDataSourceFactory { druidDataSource.setPassword(dataSourceInfo.getPassword()); druidDataSource.setBreakAfterAcquireFailure(true); druidDataSource.setConnectionErrorRetryAttempts(0); - try { - druidDataSource.getConnection(2000); - log.info("{} -> 数据源连接成功", dataSourceInfo); - return druidDataSource; - } catch (SQLException throwables) { - log.error("数据源 {} 连接失败,用户名：{}，密码 {}",dataSourceInfo.getUrl(),dataSourceInfo.getUserName(),dataSourceInfo.getPassword()); - return null; - } + druidDataSource.setInitialSize(5); + druidDataSource.setMaxActive(15); + log.info("{} -> 数据源连接成功", dataSourceInfo); + return druidDataSource; } } 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..9fbcc93 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://{}:{}/zhiLian-cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&failOverReadOnly=false"; 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..4a6cf64 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: 111.229.102.61 listener: simple: prefetch: 1 # 每次只能获取一条，处理完成才能获取下一条