From b78fee1dd0476b449f36816315aaca9337587d33 Mon Sep 17 00:00:00 2001 From: xiaohuang <1559741705@qq.com> Date: Tue, 11 Jun 2024 22:34:56 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=9E=84=E8=BD=A6=E8=BE=86=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE,=E8=BF=98=E4=B8=8D=E5=8F=AF=E4=BB=A5=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=95=B0=E6=8D=AE=20fix():=E8=A7=A3=E5=86=B3=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E9=97=AE=E9=A2=98=201:=E5=BE=B7=E9=B2=81=E4=BC=8A?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E7=A6=81=E7=94=A8=E8=87=AA=E5=8A=A8=E8=A3=85?= =?UTF-8?q?=E8=BD=BD=E7=9A=84=E6=95=B0=E6=8D=AE=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/remote/RemoteUserService.java | 5 ++ .../service/impl/BusinessServiceImpl.java | 51 ++++++++++++------- 2 files changed, 39 insertions(+), 17 deletions(-) diff --git a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/RemoteUserService.java b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/RemoteUserService.java index 0476546..80523cb 100644 --- a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/RemoteUserService.java +++ b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/RemoteUserService.java @@ -47,8 +47,13 @@ public interface RemoteUserService { @GetMapping("/user/authRole/{userId}") public Result authRole (@PathVariable("userId") Long userId); + @GetMapping("/user/userById/{userId}") + public SysUser userById(@PathVariable("userId") Long UserType); + @GetMapping("/user/selectByUserId/{userId}") public SysUser selectByUserId (@PathVariable("userId") Long userId); + + } diff --git a/muyu-modules/muyu-business/muyu-data-service/src/main/java/com/muyu/business/service/impl/BusinessServiceImpl.java b/muyu-modules/muyu-business/muyu-data-service/src/main/java/com/muyu/business/service/impl/BusinessServiceImpl.java index 715d580..70c2eb6 100644 --- a/muyu-modules/muyu-business/muyu-data-service/src/main/java/com/muyu/business/service/impl/BusinessServiceImpl.java +++ b/muyu-modules/muyu-business/muyu-data-service/src/main/java/com/muyu/business/service/impl/BusinessServiceImpl.java @@ -3,9 +3,12 @@ package com.muyu.business.service.impl; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.business.domain.Business; +import com.muyu.business.domain.Entinfo; import com.muyu.business.mapper.BusinessMapper; import com.muyu.business.service.BusinessService; +import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.DateUtils; +import com.muyu.common.redis.service.RedisService; import com.muyu.common.security.utils.SecurityUtils; import com.muyu.common.system.domain.LoginUser; import com.muyu.common.system.domain.SysUser; @@ -40,8 +43,9 @@ public class BusinessServiceImpl extends ServiceImpl i @Autowired private RemoteUserService remoteUserService; - @Autowired - private RedisTemplate redisTemplate; + @Autowired + private RedisService redisService; + @@ -73,17 +77,17 @@ public class BusinessServiceImpl extends ServiceImpl i int i = businessMapper.insertBusiness(business); System.out.println(business); - SysUser sysUser = SysUser.builder() - .userName(business.getName() + business.getId()) - .password("admin123") - .nickName(business.getName()) - .email(business.getBusinessEmail()) - .phonenumber(business.getBusinessPhone()) - .loginIp("175.24.138.82") - .userType(String.valueOf(business.getId())) - .build(); - - remoteUserService.add(sysUser); + SysUser sysUser = SysUser.builder() + .userName(business.getName()) + .password("admin123") + .nickName(business.getName()) + .email(business.getBusinessEmail()) + .phonenumber(business.getBusinessPhone()) + .loginIp("111.229.102.61") + .roleId(Long.valueOf(101)) + .userType(String.valueOf(business.getId())) + .build(); + Result add = remoteUserService.add(sysUser); return i; } @@ -97,16 +101,29 @@ public class BusinessServiceImpl extends ServiceImpl i } - + @Autowired + private EntinfoServiceImpl entinfoService; /** * * @ 判断redis是否存在端口号 * @return */ public void httpConnectMysql(Business business){ - if (business.getBusinessStates().equals(2) ) { - if (!redisTemplate.hasKey(business.getId()+business.getName())){ - redisTemplate.opsForValue().set(business.getId()+ business.getName(),String.valueOf(3306+business.getId())); + redisService.deleteObject("entinfo"); + List 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); } }