Merge branch 'dev_20260429' into dev_WMS20260401
# Conflicts: # mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/todo/UserDO.java # mhd-user-center/src/main/java/com/mhd/user/interfaces/dto/addDTO/UserDTO.java
This commit is contained in:
王奎兴
@@ -18,7 +18,7 @@ import java.util.Set;
|
||||
/**
|
||||
* bms财务结算系统feign调用接口
|
||||
*/
|
||||
@FeignClient(contextId = "BmsService", value = ServiceNameConstants.BMS_SERVICE, url = "http://10.102.192.3:8019",fallbackFactory = RemoteBmsFeignFallbackFactory.class, configuration = FeignAutoConfiguration.class)
|
||||
@FeignClient(contextId = "BmsService", value = ServiceNameConstants.BMS_SERVICE, url = "http://10.102.192.32:8019",fallbackFactory = RemoteBmsFeignFallbackFactory.class, configuration = FeignAutoConfiguration.class)
|
||||
public interface BmsServiceFeign {
|
||||
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
|
||||
@FeignClient(contextId = "OmsService", value = ServiceNameConstants.OMS_SERVICE,url = "http://10.102.192.4:8017", configuration = FeignAutoConfiguration.class)
|
||||
@FeignClient(contextId = "OmsService", value = ServiceNameConstants.OMS_SERVICE, configuration = FeignAutoConfiguration.class)
|
||||
public interface OmsServiceFeign {
|
||||
|
||||
|
||||
|
||||
@@ -26,7 +26,7 @@ import org.springframework.web.bind.annotation.*;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
@FeignClient(contextId = "commonWlhyServiceFeign",value = ServiceNameConstants.WLHY_SERVICE,url = "http://10.102.192.5:8014",configuration = FeignAutoConfiguration.class)
|
||||
@FeignClient(contextId = "commonWlhyServiceFeign",value = ServiceNameConstants.WLHY_SERVICE,url = "http://10.102.192.31:8014",configuration = FeignAutoConfiguration.class)
|
||||
public interface WlhyServiceFeign {
|
||||
|
||||
/**
|
||||
|
||||
@@ -20,7 +20,7 @@ import java.util.Map;
|
||||
* @description: TODO
|
||||
* @date 2024/5/10 8:58
|
||||
**/
|
||||
@FeignClient(contextId = "remoteWmsServiceFeign",value = ServiceNameConstants.WMS_SERVICE, url = "http://10.102.192.3:8016", fallbackFactory = RemoteWmsFallbackFactory.class, configuration = FeignAutoConfiguration.class)
|
||||
@FeignClient(contextId = "remoteWmsServiceFeign",value = ServiceNameConstants.WMS_SERVICE, url = "http://10.102.192.32:8016", fallbackFactory = RemoteWmsFallbackFactory.class, configuration = FeignAutoConfiguration.class)
|
||||
public interface WmsServiceFeign {
|
||||
|
||||
/**
|
||||
|
||||
@@ -0,0 +1,55 @@
|
||||
package com.mhd.system.api;
|
||||
|
||||
import com.mhd.common.core.constant.ServiceNameConstants;
|
||||
import com.mhd.common.core.domain.entity.R;
|
||||
import com.mhd.common.core.domain.dto.YmsSysUserDTO;
|
||||
import com.mhd.system.api.domain.YmsLoginUser;
|
||||
import com.mhd.system.api.factory.RemoteBmsFeignFallbackFactory;
|
||||
import com.mhd.system.api.feign.FeignAutoConfiguration;
|
||||
import org.springframework.cloud.openfeign.FeignClient;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
@FeignClient(contextId = "YmsService", value = ServiceNameConstants.YMS_SERVICE,fallbackFactory = RemoteBmsFeignFallbackFactory.class, configuration = FeignAutoConfiguration.class)
|
||||
public interface YmsServiceFeign {
|
||||
|
||||
/**
|
||||
* 获取YMS用户基本信息
|
||||
* @param szwlUserId 数字物流用户ID
|
||||
* @return YMS登录用户基本信息
|
||||
*/
|
||||
@GetMapping("/system/user/inner/getYmsUserInfo/{szwlUserId}")
|
||||
R<YmsLoginUser> getYmsUserInfo(@PathVariable("szwlUserId") Long szwlUserId);
|
||||
|
||||
/**
|
||||
* 获取用户详细信息
|
||||
* @param userId 用户ID
|
||||
* @return 用户信息
|
||||
*/
|
||||
@GetMapping("/system/user/inner/info/{userId}")
|
||||
R<Long> innerGetInfo(@PathVariable("userId") Long userId);
|
||||
|
||||
/**
|
||||
* 新增用户
|
||||
* @param ymsSysUserDTO 用户信息
|
||||
* @return 新增结果
|
||||
*/
|
||||
@PostMapping("/system/user/inner/add")
|
||||
R<Object> innerAdd(@RequestBody YmsSysUserDTO ymsSysUserDTO);
|
||||
|
||||
/**
|
||||
* 修改用户
|
||||
* @param ymsSysUserDTO 用户信息
|
||||
* @return 修改结果
|
||||
*/
|
||||
@PutMapping("/system/user/inner/edit")
|
||||
R<Object> innerEdit(@RequestBody YmsSysUserDTO ymsSysUserDTO);
|
||||
|
||||
/**
|
||||
* 删除用户
|
||||
* @param userIds 用户ID数组
|
||||
* @return 删除结果
|
||||
*/
|
||||
@DeleteMapping("/system/user/inner/remove/{userIds}")
|
||||
R<Object> innerRemove(@PathVariable("userIds") Long[] userIds);
|
||||
|
||||
}
|
||||
@@ -0,0 +1,63 @@
|
||||
package com.mhd.system.api.domain;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import lombok.Data;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* YMS登录用户信息
|
||||
* @author AI
|
||||
* @date 2026/05/13
|
||||
*/
|
||||
@Data
|
||||
public class YmsLoginUser {
|
||||
|
||||
//登录人id
|
||||
private Long id;
|
||||
//登录人账号
|
||||
private String username;
|
||||
//登录人名字
|
||||
private String nickName;
|
||||
//登录人密码
|
||||
private String password;
|
||||
//当前登录部门code
|
||||
private String orgCode;
|
||||
//头像
|
||||
private String avatar;
|
||||
//性别（0男 1女 2未知）
|
||||
private String sex;
|
||||
//电子邮件
|
||||
private String email;
|
||||
//电话
|
||||
private String phonenumber;
|
||||
//状态(0正常 1停用）
|
||||
private String status;
|
||||
//删除标志（0代表存在 2代表删除）
|
||||
private String delFlag;
|
||||
//最后登录IP
|
||||
private String loginIp;
|
||||
//最后登录时间
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date loginDate;
|
||||
//创建时间
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date createTime;
|
||||
//数字物流用户ID
|
||||
private Long szwlUserId;
|
||||
//一级组织表ID
|
||||
private Long topOrganizationId;
|
||||
//组织表ID
|
||||
private Long organizationId;
|
||||
//角色code集合
|
||||
private String roleCodes;
|
||||
//角色名称集合
|
||||
private String roleNames;
|
||||
//推广码
|
||||
private String promoCode;
|
||||
//账号类型 1.普通账号，2.组织账号，3.一级账号，4.平台员工，5.企业员工，6.合作商
|
||||
private Integer userAccountType;
|
||||
}
|
||||
@@ -11,6 +11,7 @@ import com.mhd.system.api.domain.MallOAuthToken;
|
||||
import com.mhd.system.api.domain.mall.BaseUser;
|
||||
import com.mhd.system.api.domain.SysUser;
|
||||
import com.mhd.system.api.domain.WlhyLoginUser;
|
||||
import com.mhd.system.api.domain.YmsLoginUser;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
@@ -87,6 +88,11 @@ public class LoginUser implements Serializable
|
||||
*/
|
||||
private WlhyLoginUser wlhyLoginUser;
|
||||
|
||||
/**
|
||||
* YMS用户信息
|
||||
*/
|
||||
private YmsLoginUser ymsLoginUser;
|
||||
|
||||
/**
|
||||
* websocket地址
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user