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

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

zhiLian-business/zhiLian-data-service/src/main/java/com/zhiLian/business/config/RabbitmqConfig.java

@@ -10,7 +10,6 @@ public class RabbitmqConfig {
     // 消息转换配置
     @Bean
     public MessageConverter jsonMessageConverter() {
-        // 使用json序列化方式，进行消息转换
         return new Jackson2JsonMessageConverter();
     }
 }

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

@@ -24,12 +24,12 @@ import lombok.experimental.SuperBuilder;
 @TableName("cart")
 public class Cart {
 
-//    @TableId
+    @TableId
     private Long id;
 
-//    @TableField(value = "name")
+    @TableField(value = "name")
     private String name;
 
-//    @TableField(value = "type_id")
+    @TableField(value = "type_id")
     private Long typeId;
 }

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

@@ -23,9 +23,9 @@ import lombok.experimental.SuperBuilder;
 @TableName("type")
 public class Type {
 
-//    @TableId
+    @TableId
     private Long id;
 
-//    @TableField(value = "type_name")
+    @TableField(value = "type_name")
     private String typeName;
 }

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

@@ -60,6 +60,4 @@ public interface EntinfoMapper extends BaseMapper<Entinfo>
      * @return 结果
      */
     public int deleteEntinfoByIds(Long[] ids);
-
-    Entinfo selectEntinfo(Entinfo business);
 }

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

@@ -1,7 +1,6 @@
 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;
@@ -61,6 +60,4 @@ public interface IEntinfoService extends IService<Entinfo>
      * @return 结果
      */
     public int deleteEntinfoById(Long id);
-
-    Entinfo selectEntinfo(Entinfo business);
 }

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

@@ -108,7 +108,7 @@ public class BusinessServiceImpl extends ServiceImpl<BusinessMapper, Business>
                 .email(business.getBusinessEmail())
                 .phonenumber(business.getBusinessPhone())
                 .loginIp("111.229.102.61")
-                .roleId(Long.valueOf(101))
+                .roleId(Long.valueOf(2))
                 .userType(String.valueOf(business.getId()))
                 .build();
         Result add = remoteUserService.add(sysUser);
@@ -139,28 +139,16 @@ public class BusinessServiceImpl extends ServiceImpl<BusinessMapper, Business>
     public void httpConnectMysql(Business business){
         redisService.deleteObject("entinfo");
         List<Entinfo> list = entinfoService.list();
-        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
     private RabbitTemplate rabbitTemplate;
 
-
     /**
      * http URL 链接
      * @param business
@@ -171,6 +159,7 @@ public class BusinessServiceImpl extends ServiceImpl<BusinessMapper, Business>
         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 {
@@ -212,6 +201,7 @@ public class BusinessServiceImpl extends ServiceImpl<BusinessMapper, Business>
             message.getMessageProperties().setMessageId(UUID.randomUUID().toString());
             return message;
         } );
+
     }
 
     /**

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

@@ -3,7 +3,6 @@ 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;
@@ -94,9 +93,4 @@ public class EntinfoServiceImpl extends ServiceImpl<EntinfoMapper, Entinfo>
     {
         return entinfoMapper.deleteEntinfoById(id);
     }
-
-    @Override
-    public Entinfo selectEntinfo(Entinfo business) {
-        return entinfoMapper.selectEntinfo(business);
-    }
 }

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

@@ -40,18 +40,19 @@ public class PlusServiceImpl extends MPJBaseServiceImpl<PlusMapper, Cart> implem
                 .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);
+//        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());
 
-
-//        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: 111.229.102.61
+    host: 122.51.111.225
     listener:
       simple:
         prefetch: 1 # 每次只能获取一条，处理完成才能获取下一条

zhiLian-business/zhiLian-data-service/src/main/resources/mapper/entInfo/EntinfoMapper.xml

@@ -28,14 +28,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectEntinfoVo"/>
         where id = #{id}
     </select>
-    <select id="selectEntinfo" resultType="com.zhiLian.business.domain.Entinfo">
-        <include refid="selectEntinfoVo"/>
-        <where>
-            <if test="entCode != null  and entCode != ''"> and ent_code = #{entCode}</if>
-            <if test="ip != null  and ip != ''"> and ip = #{ip}</if>
-            <if test="port != null "> and port = #{port}</if>
-        </where>
-    </select>
 
     <insert id="insertEntinfo" parameterType="com.zhiLian.business.domain.Entinfo" useGeneratedKeys="true" keyProperty="id">
         insert into entinfo

zhiLian-common/zhiLian-common-system/src/main/java/com/zhiLian/common/system/remote/RemoteUserService.java

@@ -50,9 +50,4 @@ 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);
 }

zhiLian-common/zhiLian-common-system/src/main/java/com/zhiLian/common/system/remote/factory/RemoteUserFallbackFactory.java

@@ -51,16 +51,6 @@ public class RemoteUserFallbackFactory implements FallbackFactory<RemoteUserServ
                 return null;
             }
 
-            @Override
-            public SysUser userById(Long userType) {
-                return null;
-            }
-
-            @Override
-            public Result updateById(SysUser user) {
-                return null;
-            }
-
         };
     }
 }

zhiLian-modules/zhiLian-modules-gen/src/main/java/com/zhiLian/gen/controller/GenController.java

@@ -73,6 +73,7 @@ public class GenController extends BaseController {
         List<GenTable> list = genTableService.selectDbTableList(genTable);
         return getDataTable(list);
     }
+
     /**
      * 查询数据表字段列表
      */

zhiLian-modules/zhiLian-modules-system/src/main/java/com/zhiLian/system/controller/SysUserController.java

@@ -18,7 +18,6 @@ import com.zhiLian.system.domain.resp.AuthRoleResp;
 import com.zhiLian.system.domain.resp.UserDetailInfoResp;
 import com.zhiLian.system.domain.resp.UserInfoResp;
 import com.zhiLian.system.service.*;
-import org.apache.catalina.User;
 import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
@@ -296,14 +295,4 @@ public class SysUserController extends BaseController {
     public Result deptTree (SysDept dept) {
         return success(deptService.selectDeptTreeList(dept));
     }
-
-    @GetMapping("/userById/{userId}")
-    public SysUser userById (@PathVariable("userId") Long UserType) {
-        SysUser user=userService.selectUserByUserType(UserType);
-        return user;
-    }
-    @PostMapping("/updateById")
-    public Result updateById (@RequestBody  SysUser user) {
-        return success(userService.updateByUserId(user));
-    }
 }

zhiLian-modules/zhiLian-modules-system/src/main/java/com/zhiLian/system/mapper/SysUserMapper.java

@@ -139,8 +139,4 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
      * @return 结果
      */
     public SysUser checkEmailUnique (String email);
-
-    void updateByUserId(SysUser user);
-
-    SysUser selectUserByUserType(String userType);
 }

zhiLian-modules/zhiLian-modules-system/src/main/java/com/zhiLian/system/service/SysUserService.java

@@ -2,7 +2,6 @@ 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;
 
@@ -226,8 +225,4 @@ public interface SysUserService extends IService<SysUser> {
      * @return 结果
      */
     public String importUser (List<SysUser> userList, Boolean isUpdateSupport, String operName);
-
-    String updateByUserId(SysUser user);
-
-    SysUser selectUserByUserType(Long userType);
 }

zhiLian-modules/zhiLian-modules-system/src/main/java/com/zhiLian/system/service/impl/SysUserServiceImpl.java

@@ -16,7 +16,6 @@ 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;
@@ -242,9 +241,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         // 新增用户岗位关联
         insertUserPost(user);
         // 新增用户与角色管理
-        if (101 == user.getRoleId()){
+        if (2 == user.getRoleId()){
             SysUserRole sysUserRole = new SysUserRole();
-            sysUserRole.setRoleId(Long.valueOf(101));
+            sysUserRole.setRoleId(Long.valueOf(2));
             sysUserRole.setUserId(user.getUserId());
             userRoleMapper.insertUserRole(sysUserRole);
         }
@@ -507,17 +506,4 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> 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;
-    }
-
 }

zhiLian-modules/zhiLian-modules-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -185,12 +185,6 @@
           and del_flag = '0'
         limit 1
     </select>
-    <select id="selectUserByUserType" resultType="com.zhiLian.common.system.domain.SysUser">
-        select user_id, user_type, nick_name, email, avatar, phonenumber, sex, status, create_time
-        from sys_user
-        where user_type = #{userType}
-    </select>
-
 
     <insert id="insertUser" parameterType="com.zhiLian.common.system.domain.SysUser" useGeneratedKeys="true" keyProperty="userId">
         insert into sys_user(
@@ -265,9 +259,6 @@
         set password = #{password}
         where user_name = #{userName}
     </update>
-    <update id="updateByUserId">
-        update sys_user_role set role_id = #{roleId} where user_id = #{userId}
-    </update>
 
     <delete id="deleteUserById" parameterType="Long">
         update sys_user

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

@@ -41,21 +41,6 @@ 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<String,String> redisTemplate;
 
@@ -74,17 +59,41 @@ public class ManyDataSource {
             //添加成功  正常消费信息
             if (count == 1) {
                 log.info("开始消费");
-                druidData(msg);
+                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<String> entinfo = redisTemplate.opsForList().range("entinfo", 0, -1);
+//                    List<Entinfo> 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();
                 //确认消费
                 channel.basicAck(message.getMessageProperties().getDeliveryTag(),false);
                 log.info("消费成功");
             }
         } catch (Exception e) {
-            log.info("消费失败，尝试重连");
+            //删除队列ID
+            log.info("消费失败");
             try {
-                //回退消息,尝试重连
+                //回退消息
-                druidData(msg);
+                channel.basicReject(message.getMessageProperties().getDeliveryTag(),true);
-                channel.basicReject(message.getMessageProperties().getDeliveryTag(),false);
                 log.info("消费失败");
             } catch (IOException ex) {
                 //回退失败
@@ -93,16 +102,6 @@ public class ManyDataSource {
         }
     }
 
-    private void druidData(String msg) {
-        Entinfo entinfo1 = JSON.parseObject(msg, Entinfo.class);
-        log.info("消息为：{}",entinfo1);
-        DruidDataSourceFactory druidDataSourceFactory = SpringUtils.getBean(DruidDataSourceFactory.class);
-        DynamicDataSource dynamicDataSource = SpringUtils.getBean(DynamicDataSource.class);
-        DataSourceInfo dataSourceInfo = DataSourceInfo.hostAndPortBuild(entinfo1.getEntCode(), entinfo1.getIp(), entinfo1.getPort());
-        DruidDataSource druidDataSource = druidDataSourceFactory.create(dataSourceInfo);
-        dynamicDataSource.put(dataSourceInfo.getKey(), druidDataSource);
-    }
-
     @Lazy
     private List<Entinfo> dataSourceInfoList(){
         List<Entinfo> databaseNameList = new ArrayList<>(){{
@@ -115,6 +114,7 @@ public class ManyDataSource {
 //        List<com.zhiLian.common.core.domain.Entinfo> entinfos = remoteFileService.listAll();
 //        databaseNameList.a(entinfos)
         List<String> entinfo = redisTemplate.opsForList().range("entinfo", 0, -1);
+
         entinfo.forEach(string -> {
             Entinfo entInfo = JSON.parseObject(string, Entinfo.class);
             databaseNameList.add(entInfo);

zhiLian-vehicle/zhiLian-vehicle-service/src/main/java/com/zhiLian/vehicle/datasource/config/factory/DruidDataSourceFactory.java

@@ -2,7 +2,6 @@ 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;
@@ -32,9 +31,13 @@ public class DruidDataSourceFactory {
         druidDataSource.setPassword(dataSourceInfo.getPassword());
         druidDataSource.setBreakAfterAcquireFailure(true);
         druidDataSource.setConnectionErrorRetryAttempts(0);
-        druidDataSource.setInitialSize(5);
+        try {
-        druidDataSource.setMaxActive(15);
+            druidDataSource.getConnection(2000);
             log.info("{} -> 数据源连接成功", dataSourceInfo);
             return druidDataSource;
+        } catch (SQLException throwables) {
+            log.error("数据源 {} 连接失败,用户名：{}，密码 {}",dataSourceInfo.getUrl(),dataSourceInfo.getUserName(),dataSourceInfo.getPassword());
+            return null;
+        }
     }
 }

zhiLian-vehicle/zhiLian-vehicle-service/src/main/java/com/zhiLian/vehicle/datasource/config/role/DynamicDataSource.java

@@ -27,7 +27,6 @@ public class DynamicDataSource extends AbstractRoutingDataSource {
      */
     private Map<Object, Object> defineTargetDataSources;
 
-
     /**
      * 决定当前线程使用哪个数据源
      */
@@ -36,7 +35,6 @@ public class DynamicDataSource extends AbstractRoutingDataSource {
         return DynamicDataSourceHolder.getDynamicDataSourceKey();
     }
 
-
     /**
      * 添加数据库
      * @param key 键

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&autoReconnect=true&failOverReadOnly=false";
+    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/resources/bootstrap.yml

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