diff --git a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysUser.java b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysUser.java index 3c838d8..2f59c1d 100644 --- a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysUser.java +++ b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysUser.java @@ -89,6 +89,7 @@ public class SysUser extends BaseEntity { /** * 用户类型(00 系统用户) */ + @Excel(name = "企业ID") private String userType; /** 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 cb968e0..9176b0e 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 @@ -7,6 +7,7 @@ import com.muyu.common.system.domain.SysUser; import com.muyu.common.system.remote.factory.RemoteUserFallbackFactory; import com.muyu.common.system.domain.LoginUser; import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; /** @@ -26,7 +27,6 @@ public interface RemoteUserService { */ @GetMapping("/user/info/{username}") public Result getUserInfo (@PathVariable("username") String username, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); - /** * 注册用户信息 * @@ -37,4 +37,18 @@ public interface RemoteUserService { */ @PostMapping("/user/register") public Result registerUserInfo (@RequestBody SysUser sysUser, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); + + @PostMapping("/user") + public Result add (@Validated @RequestBody SysUser user); + + @GetMapping("/user/info/{username}") + public Result info (@PathVariable("username") String username); + + @GetMapping("/user/authRole/{userId}") + public Result authRole (@PathVariable("userId") Long userId); + + @GetMapping("/user/selectByUserId/{userId}") + public SysUser selectByUserId (@PathVariable("userId") Long userId); + + } diff --git a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteUserFallbackFactory.java b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteUserFallbackFactory.java index b7f4d60..d02aac0 100644 --- a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteUserFallbackFactory.java +++ b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteUserFallbackFactory.java @@ -31,6 +31,26 @@ public class RemoteUserFallbackFactory implements FallbackFactory registerUserInfo (SysUser sysUser, String source) { return Result.error("注册用户失败:" + throwable.getMessage()); } + @Override + public Result add(SysUser user) { + return Result.error("注册用户失败:" + throwable.getMessage()); + } + + @Override + public Result info(String username) { + return Result.error("注册用户失败:" + throwable.getMessage()); + } + + @Override + public Result authRole(Long userId) { + return Result.error("注册用户失败:" + throwable.getMessage()); + } + + @Override + public SysUser selectByUserId(Long userId) { + return null; + } + }; } } 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 f568fd6..28176cb 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 @@ -93,6 +93,8 @@ public class BusinessServiceImpl extends ServiceImpl i public int updateBusiness(Business business) { business.setUpdateTime(DateUtils.getNowDate()); + httpConnectMysql(business); + return businessMapper.updateBusiness(business); } @@ -105,10 +107,7 @@ public class BusinessServiceImpl extends ServiceImpl i 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())); + redisTemplate.opsForValue().set(business.getId()+ business.getName(),String.valueOf(3306+business.getId())); extracted(business); } } @@ -118,7 +117,7 @@ public class BusinessServiceImpl extends ServiceImpl i private static void extracted(Business business) { - String postUrl="http://122.51.111.225:10006/webhook/%E6%96%B0%E5%BB%BA%E4%BC%81%E4%B8%9A%E6%95%B0%E6%8D%AE%E6%BA%90"; + String postUrl="http://175.24.138.82:10006/webhook/%E6%9C%AA%E5%91%BD%E5%90%8D%E9%A1%B9%E7%9B%AE"; HashMap hashMap = new HashMap<>(); hashMap.put("businessId", business.getId()+ business.getName()); hashMap.put("mysqlPort",String.valueOf(3306+ business.getId())); diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysUserController.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysUserController.java index 9811a0e..4c75ce1 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysUserController.java +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysUserController.java @@ -66,6 +66,11 @@ public class SysUserController extends BaseController { List list = userService.selectUserList(user); return getDataTable(list); } + @GetMapping("/selectByUserId/{userId}") + public SysUser selectByUserId (@PathVariable("userId") Long userId) { + SysUser user = userService.selectUserById(userId); + return user; + } @Log(title = "用户管理", businessType = BusinessType.EXPORT) @RequiresPermissions("system:user:export") diff --git a/muyu-modules/muyu-system/src/main/resources/mapper/system/SysUserMapper.xml b/muyu-modules/muyu-system/src/main/resources/mapper/system/SysUserMapper.xml index 6f633b7..6d1624b 100644 --- a/muyu-modules/muyu-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/muyu-modules/muyu-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -9,6 +9,7 @@ + @@ -56,6 +57,7 @@ u.phonenumber, u.password, u.sex, + u.user_type, u.status, u.del_flag, u.login_ip, @@ -83,7 +85,7 @@ insert into sys_user( user_id, dept_id, + user_type, user_name, nick_name, email, @@ -203,6 +206,7 @@ #{userId}, #{deptId}, #{userName}, + #{userType}, #{nickName}, #{email}, #{avatar}, @@ -221,6 +225,7 @@ dept_id = #{deptId}, user_name = #{userName}, + user_type =#{userType}, nick_name = #{nickName}, email = #{email}, phonenumber = #{phonenumber},