增加喜相随模块

warehousing-system/project/wh-common/pom.xml

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>wh</artifactId>
+        <groupId>com.wh</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <version>1.0</version>
+    <groupId>com.wh</groupId>
+    <artifactId>wh-common</artifactId>
+    <dependencies>
+        <dependency>
+            <groupId>com.yxt</groupId>
+            <artifactId>yxt-common-core</artifactId>
+            <version>0.0.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <optional>true</optional>
+            <version>1.18.20</version>
+        </dependency>
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger2</artifactId>
+            <version>2.9.2</version>
+        </dependency>
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger-ui</artifactId>
+            <version>2.9.2</version>
+        </dependency>
+    </dependencies>
+
+</project>

warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/ProjectInformationVo.java

@@ -0,0 +1,18 @@
+package com.wh.pojo.sysuser;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/25 9:29
+ */
+@ApiModel(value = "项目信息 视图数据对象", description = "项目信息 视图数据对象")
+@Data
+public class ProjectInformationVo implements Vo {
+    private String sid;
+    //项目名称
+    private String  entryName;
+}

warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/SysUser.java

@@ -0,0 +1,77 @@
+package com.wh.pojo.sysuser;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysUser.java <br/>
+ * Class: SysUser <br/>
+ * Description: 用户表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:30 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "用户表", description = "用户表")
+@TableName("sys_user")
+@Data
+public class SysUser extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    
+	@ApiModelProperty("登录名，登录名不能相同")
+    private String userName;
+    
+	@ApiModelProperty("密码（加密或签名后）")
+    private String password;
+    
+	@ApiModelProperty("密码修改时限")
+    private String pwdDayslimit;
+    
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+	@ApiModelProperty("最后一次密码修改时间")
+    private Date pwdModifyTime;
+    
+	@ApiModelProperty("在线状态（0为离线、1为在线）")
+    private Integer onlineState;
+    
+	@ApiModelProperty("用户登录时随机生成身份验证字符串")
+    private String token;
+    
+	@ApiModelProperty("是否是管理员：1管理员，2一般用户，0是超级管理员,3尚无单位人员")
+    private String isAdmin;
+    
+	@ApiModelProperty("手机登录唯一标识，手机与用户绑定字段")
+    private String appId;
+    
+	@ApiModelProperty("关联的人员sid")
+    private String staffSid;
+    
+	@ApiModelProperty("手机号")
+    private String mobile;
+    
+	@ApiModelProperty("用户类型:1员工、2客户、3供应商")
+    private Integer userType;
+
+	@ApiModelProperty("用户头像")
+    private String headImage;
+    private String openId;
+    private String appletOpenid;
+    @TableField(exist = false)
+    private List<String> roleNames;
+    private String unionid;
+    //d订阅状态
+    private String subscriptionStatus;
+}

warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/SysUserDto.java

@@ -0,0 +1,42 @@
+package com.wh.pojo.sysuser;
+
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysUserDto.java <br/>
+ * Class: SysUserDto <br/>
+ * Description: 用户表 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:30 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "用户表 数据传输对象", description = "用户表 数据传输对象")
+@Data
+public class SysUserDto implements Dto {
+    @ApiModelProperty("手机号")
+    private String mobile;
+    @ApiModelProperty("用户类型:1员工、2客户、3供应商")
+    private Integer userType;
+    @ApiModelProperty(value = "姓名", required = true)
+    //@NotBlank(message = "姓名不能为空")
+    private String name;
+    @ApiModelProperty(value = "验证码", required = true)
+    //@NotBlank(message = "验证码不能为空")
+    private String verificationCode;
+    @ApiModelProperty(value = "部门sid")
+    private String deptSid;
+    @ApiModelProperty(value = "岗位sid")
+    private String postSid;
+    private String bankMessageSid;
+    private String openid;
+    private String sid;
+}

warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/SysUserInfoVo.java

@@ -0,0 +1,30 @@
+package com.wh.pojo.sysuser;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/2/9 9:12
+ * @Description 用户组织信息
+ */
+@Data
+public class SysUserInfoVo implements Vo {
+
+    private static final long serialVersionUID = 7931121025686046432L;
+    @ApiModelProperty("关联的员工sid")
+    private String staffSid;
+
+    @ApiModelProperty("关联的员工名称")
+    private String staffName;
+
+    @ApiModelProperty("员工的组织sid（多个时为第一个）")
+    private String orgSid;
+
+    @ApiModelProperty("员工的组织名称（多个时为第一个）")
+    private String orgName;
+
+    @ApiModelProperty("员工的组织部门编码")
+    private String orgCode;
+}

warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/SysUserListVo.java

@@ -0,0 +1,19 @@
+package com.wh.pojo.sysuser;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/9/14 15:36
+ * @Description
+ */
+@Data
+public class SysUserListVo implements Vo {
+    private static final long serialVersionUID = -3047907553025391436L;
+
+    private String name;
+
+    private String sid;
+
+}

warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/SysUserQuery.java

@@ -0,0 +1,51 @@
+package com.wh.pojo.sysuser;
+
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysUserQuery.java <br/>
+ * Class: SysUserQuery <br/>
+ * Description: 用户表 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:30 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "用户表 查询条件", description = "用户表 查询条件")
+@Data
+public class SysUserQuery implements Query {
+
+
+    @ApiModelProperty("角色sid")
+    private String roleSid;
+    @ApiModelProperty("用户名称")
+    private String userName;
+    @ApiModelProperty("姓名")
+    private String name;
+    @ApiModelProperty("部门名称")
+    private String orgName;
+
+    @ApiModelProperty("密码（加密或签名后）")
+    private String password;
+
+    @ApiModelProperty("用户登录时随机生成身份验证字符串")
+    private String token;
+    @ApiModelProperty("用户登录时随机生成的验证码字符串")
+    private String verifyCode;
+    private String uuid;
+
+    @ApiModelProperty("手机登录唯一标识，手机与用户绑定字段")
+    private String appId;
+    @ApiModelProperty("手机登录类型：1、密码登录2、验证码登录")
+    private String type;
+    @ApiModelProperty(value = "是否是测试",example = "false")
+    private Boolean isTest;
+}

warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/SysUserUpdate.java

@@ -0,0 +1,15 @@
+package com.wh.pojo.sysuser;
+
+import lombok.Data;
+
+/**
+ * @author feikefei
+ * @create 2023-08-18-17:19
+ */
+@Data
+public class SysUserUpdate {
+    private String original;
+    private String password;
+    private String confirmPassword;
+    private String userSid;
+}

warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/SysUserVo.java

@@ -0,0 +1,94 @@
+package com.wh.pojo.sysuser;
+
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysUserVo.java <br/>
+ * Class: SysUserVo <br/>
+ * Description: 用户表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:30 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "用户表 视图数据对象", description = "用户表 视图数据对象")
+@Data
+@NoArgsConstructor
+public class SysUserVo implements Vo {
+    private static final long serialVersionUID = 2415131854581950721L;
+    @ApiModelProperty("部门sid")
+    private String departmentSid;
+	@ApiModelProperty("部门名称")
+    private String departmentName;
+    @ApiModelProperty("上级部门名称-本级部门名称 岗位名称")
+    @JsonProperty("pNameAndDepartmentNameAndPostName")
+    private String pNameAndDepartmentNameAndPostName;
+	@ApiModelProperty("岗位名称")
+    private String  postName;
+	@ApiModelProperty("岗位Sid")
+    private String  postSid;
+    @ApiModelProperty("单位sid")
+    private String organizationSid;
+	@ApiModelProperty("单位名称")
+    private String organizationName;
+	@ApiModelProperty("用户姓名")
+    private String name;
+	@ApiModelProperty("登录名，登录名不能相同")
+    private String userName;
+
+    @ApiModelProperty("id")
+    private Integer id;
+	@ApiModelProperty("用户sid")
+    private String sid;
+    @ApiModelProperty("是否是管理员：1管理员，2一般用户，0是超级管理员,3尚无单位人员")
+    private String isAdmin;
+    @ApiModelProperty("角色名称")
+    private String roleName;
+
+	@ApiModelProperty("关联的人员sid")
+    private String staffSid;
+    
+	@ApiModelProperty("手机号")
+    private String mobile;
+    @ApiModelProperty(value = "禁用状态")
+    private String isEnable;
+    
+	@ApiModelProperty("用户类型:1员工、2客户、3供应商")
+    private String userType;
+	@ApiModelProperty("用户类型:1、2、3")
+    private String userTypeKey;
+    @ApiModelProperty("用户头像")
+    private String headImage;
+    @ApiModelProperty("组织名称")
+    private String orgNamePath;
+    @ApiModelProperty("组织sid")
+    private String orgSidPath;
+    @ApiModelProperty(value = "token")
+    private String token;
+    @ApiModelProperty(value = "角色sids")
+    private List<String> roleSids = new ArrayList<>();
+
+    private String defaultOrgPath;
+    private String defaultOrgPathName;
+
+    @ApiModelProperty("是否需要更换密码")
+    private Boolean needResetPsd;
+    @ApiModelProperty("工号")
+    private String jobNumber;
+    private String openid;
+    @ApiModelProperty("项目sid集合")
+    private List<ProjectInformationVo> projectSidList;
+}

warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/UserQuery.java

@@ -0,0 +1,21 @@
+package com.wh.pojo.sysuser;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/6/21 8:47
+ * @Description
+ */
+@Data
+public class UserQuery implements Query {
+
+    private static final long serialVersionUID = -3979717077029562761L;
+    @ApiModelProperty(value = "角色sid必传项")
+    private String roleSid;
+    @ApiModelProperty(value = "用户部门sid路径是必传项")
+    private String orgSidPath;
+
+}

warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/UserRoleQuery.java

@@ -0,0 +1,19 @@
+package com.wh.pojo.sysuser;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/8/25 8:38
+ * @Description
+ */
+@Data
+public class UserRoleQuery implements Query {
+    private static final long serialVersionUID = 1913450300189800653L;
+
+    @ApiModelProperty("角色sid")
+    private String roleSid;
+    private String orgSid;
+}

warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/app/AppMySysUserInfo.java

@@ -0,0 +1,28 @@
+package com.wh.pojo.sysuser.app;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
+import lombok.Data;
+
+/**
+ * @Description
+ * @Author liuguohui
+ * @Date 2021/9/14
+ */
+@ApiOperation(value = "App我的信息")
+@Data
+public class AppMySysUserInfo implements Vo {
+
+    @ApiModelProperty("id")
+    private String id;
+    @ApiModelProperty("用户姓名")
+    private String name;
+    @ApiModelProperty("用户头像")
+    private String headImage;
+
+    @ApiModelProperty("职位")
+    private String position;
+    @ApiModelProperty("部门")
+    private String department;
+}

warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/app/AppUserOrgInfoVo.java

@@ -0,0 +1,34 @@
+package com.wh.pojo.sysuser.app;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
+import lombok.Data;
+
+/**
+ * @Description
+ * @Author liuguohui
+ * @Date 2021/12/17
+ */
+@ApiOperation("用户组织信息")
+@Data
+public class AppUserOrgInfoVo implements Vo {
+
+    @ApiModelProperty("关联的员工sid")
+    private String staffSid;
+
+    @ApiModelProperty("关联的员工名称")
+    private String staffName;
+
+    @ApiModelProperty("员工的组织sid（多个时为第一个）")
+    private String orgSid;
+
+    @ApiModelProperty("员工的组织名称（多个时为第一个）")
+    private String orgName;
+
+    @ApiModelProperty("员工的组织部门编码")
+    private String orgCode;
+
+    @ApiModelProperty("部门路径")
+    private String orgSidPath;
+}

warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/app/MyInfoQuery.java

@@ -0,0 +1,19 @@
+package com.wh.pojo.sysuser.app;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/10/22 15:24
+ * @Description
+ */
+@Data
+public class MyInfoQuery implements Query {
+    private static final long serialVersionUID = -4771501933318214145L;
+    @ApiModelProperty("用户sid")
+    private String userSid;
+    @ApiModelProperty("组织机构sid")
+    private String orgPath;
+}

warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/app/OrgList.java

@@ -0,0 +1,17 @@
+package com.wh.pojo.sysuser.app;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/9/21 9:26
+ * @Description
+ */
+@Data
+public class OrgList implements Vo {
+    private static final long serialVersionUID = -2867882982421321776L;
+
+    private String orgName;
+    private String orgPath;
+}

warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/wx/SmsVerifyCodeQuery.java

@@ -0,0 +1,15 @@
+package com.wh.pojo.sysuser.wx;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class SmsVerifyCodeQuery implements Query {
+    @ApiModelProperty("手机号码")
+    private String mobile;
+    @ApiModelProperty("手机验证码")
+    private String code;
+    @ApiModelProperty("调用定位")
+    String callLocation;
+}

warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/wx/SysUserLoginVo.java

@@ -0,0 +1,15 @@
+package com.wh.pojo.sysuser.wx;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class SysUserLoginVo implements Vo {
+    @ApiModelProperty(value = "用户Sid")
+    private String sysUserSid;
+    @ApiModelProperty(value = "用户登录时随机生成身份验证字符串")
+    private String token;
+    @ApiModelProperty(value = "是否登陆")
+    private Boolean isLogin;
+}

warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/wx/SysUserWxBindMobileDto.java

@@ -0,0 +1,18 @@
+package com.wh.pojo.sysuser.wx;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class SysUserWxBindMobileDto implements Dto {
+    @ApiModelProperty(value = "用户登陆授权Sid")
+    private String sysUserWxAuthSid;
+    @ApiModelProperty(value = "手机号")
+    private String mobile;
+    @ApiModelProperty(value = "验证码")
+    private String code;
+    //微信id
+    private String openid;
+    private String unionid;
+}

warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/wx/WxHomePageVo.java

@@ -0,0 +1,27 @@
+package com.wh.pojo.sysuser.wx;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author dimengzhe
+ * @date 2021/10/12 10:53
+ * @description
+ */
+@Data
+public class WxHomePageVo implements Vo {
+    private static final long serialVersionUID = 2116719971434282451L;
+    @ApiModelProperty(value = "头像")
+    private String headImage;
+
+    @ApiModelProperty(value = "提醒")
+    private String message;
+
+    @ApiModelProperty(value = "身份证有效期")
+    private String idTerm;
+    @ApiModelProperty(value = "是否有提示")
+    private Boolean isHave;
+    @ApiModelProperty(value = "客户sid")
+    private String staffSid;
+}

warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/wx/WxMySysUserInfoVo.java

@@ -0,0 +1,23 @@
+package com.wh.pojo.sysuser.wx;
+
+import com.yxt.common.core.utils.desensitized.Sensitive;
+import com.yxt.common.core.utils.desensitized.SensitiveTypeEnum;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author dimengzhe
+ * @date 2021/10/6 9:12
+ * @description 客户端我的页面
+ */
+@Data
+public class WxMySysUserInfoVo implements Vo {
+    private static final long serialVersionUID = 6495105262502269503L;
+
+    @ApiModelProperty(value = "姓名")
+    @Sensitive(type = SensitiveTypeEnum.CHINESE_NAME)
+    private String name;
+    @ApiModelProperty(value = "头像")
+    private String headImage;
+}

warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/wx/WxSysUserDto.java

@@ -0,0 +1,33 @@
+package com.wh.pojo.sysuser.wx;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Pattern;
+
+/**
+ * @author dimengzhe
+ * @date 2021/10/5 13:31
+ * @description
+ */
+@Data
+public class WxSysUserDto implements Dto {
+    private static final long serialVersionUID = -3446342255009165324L;
+
+    @ApiModelProperty(value = "手机号", required = true)
+    @NotBlank(message = "手机号不能为空")
+    @Pattern(regexp = "^((13[0-9])|(14[5,7])|(15[0-3,5-9])|(17[0,3,5-8])|(18[0-9])|166|198|199|(147))\\d{8}$", message = "手机号码格式不正确")
+    private String mobile;
+    @ApiModelProperty(value = "验证码", required = true)
+    @NotBlank(message = "验证码不能为空")
+    private String verificationCode;
+    @ApiModelProperty(value = "姓名", required = true)
+    @NotBlank(message = "姓名不能为空")
+    private String name;
+    @ApiModelProperty(value = "身份证号", required = true)
+    @NotBlank(message = "身份证号不能为空")
+    private String idNo;
+
+}

warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/wx/WxSysUserLoginQuery.java

@@ -0,0 +1,29 @@
+package com.wh.pojo.sysuser.wx;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @author dimengzhe
+ * @date 2021/10/6 14:31
+ * @description
+ */
+@Data
+public class WxSysUserLoginQuery implements Query {
+    private static final long serialVersionUID = -3754864114501469472L;
+    @ApiModelProperty(value = "用户名或手机号", required = true)
+    @NotBlank(message = "用户名不能为空")
+    private String userName;
+    @ApiModelProperty(value = "手机登录类型：1、密码登录，2、验证码登录", required = true)
+    @NotBlank(message = "手机登录类型不能为空")
+    private String type;
+
+    @ApiModelProperty(value = "密码")
+    private String password;
+
+    @ApiModelProperty(value = "验证码")
+    private String verifyCode;
+}

warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/wx/WxSysUserVo.java

@@ -0,0 +1,38 @@
+package com.wh.pojo.sysuser.wx;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author dimengzhe
+ * @date 2021/10/6 14:52
+ * @description
+ */
+@Data
+public class WxSysUserVo implements Vo {
+    private static final long serialVersionUID = 1700823767702299465L;
+    /*若为员工，则为人员sid。若为客户，则为客户sid。若为供应厂商，则为供应厂商的sid*/
+    @ApiModelProperty(value = "关联的客户sid")
+    private String staffSid;
+
+    @ApiModelProperty(value = "手机号")
+    private String mobile;
+
+    @ApiModelProperty(value = "用户类型:1员工、2客户、3供应商")
+    private String userType;
+
+    @ApiModelProperty(value = "用户sid")
+    private String userSid;
+
+    @ApiModelProperty(value = "登录名，登录名不能相同")
+    private String userName;
+    @ApiModelProperty(value = "用户姓名")
+    private String name;
+
+    @ApiModelProperty(value = "token")
+    private String token;
+
+    @ApiModelProperty(value = "未读数量",example = "1")
+    private String num;
+}

warehousing-system/project/wh-manage/pom.xml

@@ -308,7 +308,6 @@
                 <version>${flowable.version}</version>
                 <scope>compile</scope>
             </dependency>
-
             <dependency>
                 <groupId>org.flowable</groupId>
                 <artifactId>flowable-spring-boot-starter-basic</artifactId>
@@ -399,6 +398,11 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
+       <!-- <dependency>
+            <groupId>com.wh</groupId>
+            <artifactId>wh-common</artifactId>
+            <version>1.0</version>
+        </dependency>-->
     </dependencies>
     <!--添加build标签-->
     <build>

warehousing-system/project/wh-manage/src/main/java/com/wh/controller/sysuser/ProjectInformationVo.java

@@ -0,0 +1,18 @@
+package com.wh.controller.sysuser;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/25 9:29
+ */
+@ApiModel(value = "项目信息 视图数据对象", description = "项目信息 视图数据对象")
+@Data
+public class ProjectInformationVo implements Vo {
+    private String sid;
+    //项目名称
+    private String  entryName;
+}

warehousing-system/project/wh-manage/src/main/java/com/wh/controller/sysuser/SysUser.java

@@ -0,0 +1,77 @@
+package com.wh.controller.sysuser;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysUser.java <br/>
+ * Class: SysUser <br/>
+ * Description: 用户表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:30 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "用户表", description = "用户表")
+@TableName("sys_user")
+@Data
+public class SysUser extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    
+	@ApiModelProperty("登录名，登录名不能相同")
+    private String userName;
+    
+	@ApiModelProperty("密码（加密或签名后）")
+    private String password;
+    
+	@ApiModelProperty("密码修改时限")
+    private String pwdDayslimit;
+    
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+	@ApiModelProperty("最后一次密码修改时间")
+    private Date pwdModifyTime;
+    
+	@ApiModelProperty("在线状态（0为离线、1为在线）")
+    private Integer onlineState;
+    
+	@ApiModelProperty("用户登录时随机生成身份验证字符串")
+    private String token;
+    
+	@ApiModelProperty("是否是管理员：1管理员，2一般用户，0是超级管理员,3尚无单位人员")
+    private String isAdmin;
+    
+	@ApiModelProperty("手机登录唯一标识，手机与用户绑定字段")
+    private String appId;
+    
+	@ApiModelProperty("关联的人员sid")
+    private String staffSid;
+    
+	@ApiModelProperty("手机号")
+    private String mobile;
+    
+	@ApiModelProperty("用户类型:1员工、2客户、3供应商")
+    private Integer userType;
+
+	@ApiModelProperty("用户头像")
+    private String headImage;
+    private String openId;
+    private String appletOpenid;
+    @TableField(exist = false)
+    private List<String> roleNames;
+    private String unionid;
+    //d订阅状态
+    private String subscriptionStatus;
+}

warehousing-system/project/wh-manage/src/main/java/com/wh/controller/sysuser/SysUserDto.java

@@ -0,0 +1,42 @@
+package com.wh.controller.sysuser;
+
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysUserDto.java <br/>
+ * Class: SysUserDto <br/>
+ * Description: 用户表 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:30 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "用户表 数据传输对象", description = "用户表 数据传输对象")
+@Data
+public class SysUserDto implements Dto {
+    @ApiModelProperty("手机号")
+    private String mobile;
+    @ApiModelProperty("用户类型:1员工、2客户、3供应商")
+    private Integer userType;
+    @ApiModelProperty(value = "姓名", required = true)
+    //@NotBlank(message = "姓名不能为空")
+    private String name;
+    @ApiModelProperty(value = "验证码", required = true)
+    //@NotBlank(message = "验证码不能为空")
+    private String verificationCode;
+    @ApiModelProperty(value = "部门sid")
+    private String deptSid;
+    @ApiModelProperty(value = "岗位sid")
+    private String postSid;
+    private String bankMessageSid;
+    private String openid;
+    private String sid;
+}

warehousing-system/project/wh-manage/src/main/java/com/wh/controller/sysuser/SysUserInfoVo.java

@@ -0,0 +1,30 @@
+package com.wh.controller.sysuser;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/2/9 9:12
+ * @Description 用户组织信息
+ */
+@Data
+public class SysUserInfoVo implements Vo {
+
+    private static final long serialVersionUID = 7931121025686046432L;
+    @ApiModelProperty("关联的员工sid")
+    private String staffSid;
+
+    @ApiModelProperty("关联的员工名称")
+    private String staffName;
+
+    @ApiModelProperty("员工的组织sid（多个时为第一个）")
+    private String orgSid;
+
+    @ApiModelProperty("员工的组织名称（多个时为第一个）")
+    private String orgName;
+
+    @ApiModelProperty("员工的组织部门编码")
+    private String orgCode;
+}

warehousing-system/project/wh-manage/src/main/java/com/wh/controller/sysuser/SysUserListVo.java

@@ -0,0 +1,19 @@
+package com.wh.controller.sysuser;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/9/14 15:36
+ * @Description
+ */
+@Data
+public class SysUserListVo implements Vo {
+    private static final long serialVersionUID = -3047907553025391436L;
+
+    private String name;
+
+    private String sid;
+
+}

warehousing-system/project/wh-manage/src/main/java/com/wh/controller/sysuser/SysUserQuery.java

@@ -0,0 +1,51 @@
+package com.wh.controller.sysuser;
+
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysUserQuery.java <br/>
+ * Class: SysUserQuery <br/>
+ * Description: 用户表 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:30 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "用户表 查询条件", description = "用户表 查询条件")
+@Data
+public class SysUserQuery implements Query {
+
+
+    @ApiModelProperty("角色sid")
+    private String roleSid;
+    @ApiModelProperty("用户名称")
+    private String userName;
+    @ApiModelProperty("姓名")
+    private String name;
+    @ApiModelProperty("部门名称")
+    private String orgName;
+
+    @ApiModelProperty("密码（加密或签名后）")
+    private String password;
+
+    @ApiModelProperty("用户登录时随机生成身份验证字符串")
+    private String token;
+    @ApiModelProperty("用户登录时随机生成的验证码字符串")
+    private String verifyCode;
+    private String uuid;
+
+    @ApiModelProperty("手机登录唯一标识，手机与用户绑定字段")
+    private String appId;
+    @ApiModelProperty("手机登录类型：1、密码登录2、验证码登录")
+    private String type;
+    @ApiModelProperty(value = "是否是测试",example = "false")
+    private Boolean isTest;
+}

warehousing-system/project/wh-manage/src/main/java/com/wh/controller/sysuser/SysUserRest.java

@@ -3,7 +3,6 @@ package com.wh.controller.sysuser;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import com.wh.pojo.sysuser.*;
 import com.wh.service.sysuser.SysUserService;
 import com.yxt.common.base.config.RedisUtil;
 import com.yxt.common.base.config.component.FileUploadComponent;

warehousing-system/project/wh-manage/src/main/java/com/wh/controller/sysuser/SysUserUpdate.java

@@ -0,0 +1,15 @@
+package com.wh.controller.sysuser;
+
+import lombok.Data;
+
+/**
+ * @author feikefei
+ * @create 2023-08-18-17:19
+ */
+@Data
+public class SysUserUpdate {
+    private String original;
+    private String password;
+    private String confirmPassword;
+    private String userSid;
+}

warehousing-system/project/wh-manage/src/main/java/com/wh/controller/sysuser/SysUserVo.java

@@ -0,0 +1,94 @@
+package com.wh.controller.sysuser;
+
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysUserVo.java <br/>
+ * Class: SysUserVo <br/>
+ * Description: 用户表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:30 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "用户表 视图数据对象", description = "用户表 视图数据对象")
+@Data
+@NoArgsConstructor
+public class SysUserVo implements Vo {
+    private static final long serialVersionUID = 2415131854581950721L;
+    @ApiModelProperty("部门sid")
+    private String departmentSid;
+	@ApiModelProperty("部门名称")
+    private String departmentName;
+    @ApiModelProperty("上级部门名称-本级部门名称 岗位名称")
+    @JsonProperty("pNameAndDepartmentNameAndPostName")
+    private String pNameAndDepartmentNameAndPostName;
+	@ApiModelProperty("岗位名称")
+    private String  postName;
+	@ApiModelProperty("岗位Sid")
+    private String  postSid;
+    @ApiModelProperty("单位sid")
+    private String organizationSid;
+	@ApiModelProperty("单位名称")
+    private String organizationName;
+	@ApiModelProperty("用户姓名")
+    private String name;
+	@ApiModelProperty("登录名，登录名不能相同")
+    private String userName;
+
+    @ApiModelProperty("id")
+    private Integer id;
+	@ApiModelProperty("用户sid")
+    private String sid;
+    @ApiModelProperty("是否是管理员：1管理员，2一般用户，0是超级管理员,3尚无单位人员")
+    private String isAdmin;
+    @ApiModelProperty("角色名称")
+    private String roleName;
+
+	@ApiModelProperty("关联的人员sid")
+    private String staffSid;
+    
+	@ApiModelProperty("手机号")
+    private String mobile;
+    @ApiModelProperty(value = "禁用状态")
+    private String isEnable;
+    
+	@ApiModelProperty("用户类型:1员工、2客户、3供应商")
+    private String userType;
+	@ApiModelProperty("用户类型:1、2、3")
+    private String userTypeKey;
+    @ApiModelProperty("用户头像")
+    private String headImage;
+    @ApiModelProperty("组织名称")
+    private String orgNamePath;
+    @ApiModelProperty("组织sid")
+    private String orgSidPath;
+    @ApiModelProperty(value = "token")
+    private String token;
+    @ApiModelProperty(value = "角色sids")
+    private List<String> roleSids = new ArrayList<>();
+
+    private String defaultOrgPath;
+    private String defaultOrgPathName;
+
+    @ApiModelProperty("是否需要更换密码")
+    private Boolean needResetPsd;
+    @ApiModelProperty("工号")
+    private String jobNumber;
+    private String openid;
+    @ApiModelProperty("项目sid集合")
+    private List<ProjectInformationVo> projectSidList;
+}

warehousing-system/project/wh-manage/src/main/java/com/wh/controller/sysuser/UserQuery.java

@@ -0,0 +1,21 @@
+package com.wh.controller.sysuser;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/6/21 8:47
+ * @Description
+ */
+@Data
+public class UserQuery implements Query {
+
+    private static final long serialVersionUID = -3979717077029562761L;
+    @ApiModelProperty(value = "角色sid必传项")
+    private String roleSid;
+    @ApiModelProperty(value = "用户部门sid路径是必传项")
+    private String orgSidPath;
+
+}

warehousing-system/project/wh-manage/src/main/java/com/wh/controller/sysuser/UserRoleQuery.java

@@ -0,0 +1,19 @@
+package com.wh.controller.sysuser;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/8/25 8:38
+ * @Description
+ */
+@Data
+public class UserRoleQuery implements Query {
+    private static final long serialVersionUID = 1913450300189800653L;
+
+    @ApiModelProperty("角色sid")
+    private String roleSid;
+    private String orgSid;
+}

warehousing-system/project/wh-manage/src/main/java/com/wh/controller/sysuser/app/AppMySysUserInfo.java

@@ -0,0 +1,28 @@
+package com.wh.controller.sysuser.app;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
+import lombok.Data;
+
+/**
+ * @Description
+ * @Author liuguohui
+ * @Date 2021/9/14
+ */
+@ApiOperation(value = "App我的信息")
+@Data
+public class AppMySysUserInfo implements Vo {
+
+    @ApiModelProperty("id")
+    private String id;
+    @ApiModelProperty("用户姓名")
+    private String name;
+    @ApiModelProperty("用户头像")
+    private String headImage;
+
+    @ApiModelProperty("职位")
+    private String position;
+    @ApiModelProperty("部门")
+    private String department;
+}

warehousing-system/project/wh-manage/src/main/java/com/wh/controller/sysuser/app/AppUserOrgInfoVo.java

@@ -0,0 +1,34 @@
+package com.wh.controller.sysuser.app;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
+import lombok.Data;
+
+/**
+ * @Description
+ * @Author liuguohui
+ * @Date 2021/12/17
+ */
+@ApiOperation("用户组织信息")
+@Data
+public class AppUserOrgInfoVo implements Vo {
+
+    @ApiModelProperty("关联的员工sid")
+    private String staffSid;
+
+    @ApiModelProperty("关联的员工名称")
+    private String staffName;
+
+    @ApiModelProperty("员工的组织sid（多个时为第一个）")
+    private String orgSid;
+
+    @ApiModelProperty("员工的组织名称（多个时为第一个）")
+    private String orgName;
+
+    @ApiModelProperty("员工的组织部门编码")
+    private String orgCode;
+
+    @ApiModelProperty("部门路径")
+    private String orgSidPath;
+}

warehousing-system/project/wh-manage/src/main/java/com/wh/controller/sysuser/app/MyInfoQuery.java

@@ -0,0 +1,19 @@
+package com.wh.controller.sysuser.app;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/10/22 15:24
+ * @Description
+ */
+@Data
+public class MyInfoQuery implements Query {
+    private static final long serialVersionUID = -4771501933318214145L;
+    @ApiModelProperty("用户sid")
+    private String userSid;
+    @ApiModelProperty("组织机构sid")
+    private String orgPath;
+}

warehousing-system/project/wh-manage/src/main/java/com/wh/controller/sysuser/app/OrgList.java

@@ -0,0 +1,17 @@
+package com.wh.controller.sysuser.app;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/9/21 9:26
+ * @Description
+ */
+@Data
+public class OrgList implements Vo {
+    private static final long serialVersionUID = -2867882982421321776L;
+
+    private String orgName;
+    private String orgPath;
+}

warehousing-system/project/wh-manage/src/main/java/com/wh/controller/sysuser/wx/SmsVerifyCodeQuery.java

@@ -0,0 +1,15 @@
+package com.wh.controller.sysuser.wx;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class SmsVerifyCodeQuery implements Query {
+    @ApiModelProperty("手机号码")
+    private String mobile;
+    @ApiModelProperty("手机验证码")
+    private String code;
+    @ApiModelProperty("调用定位")
+    String callLocation;
+}

warehousing-system/project/wh-manage/src/main/java/com/wh/controller/sysuser/wx/SysUserLoginVo.java

@@ -0,0 +1,15 @@
+package com.wh.controller.sysuser.wx;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class SysUserLoginVo implements Vo {
+    @ApiModelProperty(value = "用户Sid")
+    private String sysUserSid;
+    @ApiModelProperty(value = "用户登录时随机生成身份验证字符串")
+    private String token;
+    @ApiModelProperty(value = "是否登陆")
+    private Boolean isLogin;
+}

warehousing-system/project/wh-manage/src/main/java/com/wh/controller/sysuser/wx/SysUserWxBindMobileDto.java

@@ -0,0 +1,18 @@
+package com.wh.controller.sysuser.wx;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class SysUserWxBindMobileDto implements Dto {
+    @ApiModelProperty(value = "用户登陆授权Sid")
+    private String sysUserWxAuthSid;
+    @ApiModelProperty(value = "手机号")
+    private String mobile;
+    @ApiModelProperty(value = "验证码")
+    private String code;
+    //微信id
+    private String openid;
+    private String unionid;
+}

warehousing-system/project/wh-manage/src/main/java/com/wh/controller/sysuser/wx/WxHomePageVo.java

@@ -0,0 +1,27 @@
+package com.wh.controller.sysuser.wx;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author dimengzhe
+ * @date 2021/10/12 10:53
+ * @description
+ */
+@Data
+public class WxHomePageVo implements Vo {
+    private static final long serialVersionUID = 2116719971434282451L;
+    @ApiModelProperty(value = "头像")
+    private String headImage;
+
+    @ApiModelProperty(value = "提醒")
+    private String message;
+
+    @ApiModelProperty(value = "身份证有效期")
+    private String idTerm;
+    @ApiModelProperty(value = "是否有提示")
+    private Boolean isHave;
+    @ApiModelProperty(value = "客户sid")
+    private String staffSid;
+}

warehousing-system/project/wh-manage/src/main/java/com/wh/controller/sysuser/wx/WxMySysUserInfoVo.java

@@ -0,0 +1,23 @@
+package com.wh.controller.sysuser.wx;
+
+import com.yxt.common.core.utils.desensitized.Sensitive;
+import com.yxt.common.core.utils.desensitized.SensitiveTypeEnum;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author dimengzhe
+ * @date 2021/10/6 9:12
+ * @description 客户端我的页面
+ */
+@Data
+public class WxMySysUserInfoVo implements Vo {
+    private static final long serialVersionUID = 6495105262502269503L;
+
+    @ApiModelProperty(value = "姓名")
+    @Sensitive(type = SensitiveTypeEnum.CHINESE_NAME)
+    private String name;
+    @ApiModelProperty(value = "头像")
+    private String headImage;
+}

warehousing-system/project/wh-manage/src/main/java/com/wh/controller/sysuser/wx/WxSysUserDto.java

@@ -0,0 +1,33 @@
+package com.wh.controller.sysuser.wx;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Pattern;
+
+/**
+ * @author dimengzhe
+ * @date 2021/10/5 13:31
+ * @description
+ */
+@Data
+public class WxSysUserDto implements Dto {
+    private static final long serialVersionUID = -3446342255009165324L;
+
+    @ApiModelProperty(value = "手机号", required = true)
+    @NotBlank(message = "手机号不能为空")
+    @Pattern(regexp = "^((13[0-9])|(14[5,7])|(15[0-3,5-9])|(17[0,3,5-8])|(18[0-9])|166|198|199|(147))\\d{8}$", message = "手机号码格式不正确")
+    private String mobile;
+    @ApiModelProperty(value = "验证码", required = true)
+    @NotBlank(message = "验证码不能为空")
+    private String verificationCode;
+    @ApiModelProperty(value = "姓名", required = true)
+    @NotBlank(message = "姓名不能为空")
+    private String name;
+    @ApiModelProperty(value = "身份证号", required = true)
+    @NotBlank(message = "身份证号不能为空")
+    private String idNo;
+
+}

warehousing-system/project/wh-manage/src/main/java/com/wh/controller/sysuser/wx/WxSysUserLoginQuery.java

@@ -0,0 +1,29 @@
+package com.wh.controller.sysuser.wx;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @author dimengzhe
+ * @date 2021/10/6 14:31
+ * @description
+ */
+@Data
+public class WxSysUserLoginQuery implements Query {
+    private static final long serialVersionUID = -3754864114501469472L;
+    @ApiModelProperty(value = "用户名或手机号", required = true)
+    @NotBlank(message = "用户名不能为空")
+    private String userName;
+    @ApiModelProperty(value = "手机登录类型：1、密码登录，2、验证码登录", required = true)
+    @NotBlank(message = "手机登录类型不能为空")
+    private String type;
+
+    @ApiModelProperty(value = "密码")
+    private String password;
+
+    @ApiModelProperty(value = "验证码")
+    private String verifyCode;
+}

warehousing-system/project/wh-manage/src/main/java/com/wh/controller/sysuser/wx/WxSysUserVo.java

@@ -0,0 +1,38 @@
+package com.wh.controller.sysuser.wx;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author dimengzhe
+ * @date 2021/10/6 14:52
+ * @description
+ */
+@Data
+public class WxSysUserVo implements Vo {
+    private static final long serialVersionUID = 1700823767702299465L;
+    /*若为员工，则为人员sid。若为客户，则为客户sid。若为供应厂商，则为供应厂商的sid*/
+    @ApiModelProperty(value = "关联的客户sid")
+    private String staffSid;
+
+    @ApiModelProperty(value = "手机号")
+    private String mobile;
+
+    @ApiModelProperty(value = "用户类型:1员工、2客户、3供应商")
+    private String userType;
+
+    @ApiModelProperty(value = "用户sid")
+    private String userSid;
+
+    @ApiModelProperty(value = "登录名，登录名不能相同")
+    private String userName;
+    @ApiModelProperty(value = "用户姓名")
+    private String name;
+
+    @ApiModelProperty(value = "token")
+    private String token;
+
+    @ApiModelProperty(value = "未读数量",example = "1")
+    private String num;
+}

warehousing-system/project/wh-manage/src/main/java/com/wh/mapper/sysuser/SysUserMapper.java

@@ -4,9 +4,9 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
-import com.wh.pojo.sysuser.SysUser;
-import com.wh.pojo.sysuser.SysUserInfoVo;
-import com.wh.pojo.sysuser.SysUserVo;
+import com.wh.controller.sysuser.SysUser;
+import com.wh.controller.sysuser.SysUserInfoVo;
+import com.wh.controller.sysuser.SysUserVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;

warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/api/OutStorehouseMainQuery.java

@@ -16,6 +16,7 @@ public class OutStorehouseMainQuery implements Query {
     private String applicationDateStart;      	//date	50					制单日期
     private String creatorName;      ///	varchar	50					制单人姓名
     private String custerName;     // 	varchar	100					客户名称（企业）
+    private String custerSid;
     private String mainSid;     // 	varchar	100					mainSid
     private String state;
 }

warehousing-system/project/wh-manage/src/main/java/com/wh/service/sysuser/SysUserService.java

@@ -4,10 +4,10 @@ import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.wh.controller.sysuser.*;
+import com.wh.controller.sysuser.wx.WxSysUserVo;
 import com.wh.feign.crm.ProjectInformationFeign;
 import com.wh.mapper.sysuser.SysUserMapper;
-import com.wh.pojo.sysuser.*;
-import com.wh.pojo.sysuser.wx.*;
 import com.yxt.common.base.config.RedisUtil;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.config.component.ImageUploadUtil;
@@ -26,7 +26,6 @@ import java.util.*;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
-
 import static java.util.concurrent.Executors.newScheduledThreadPool;
 
 /**

warehousing-system/project/wh-manage/src/main/resources/mappers/SysUserMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.wh.mapper.sysuser.SysUserMapper">
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
-    <select id="selectPageVo" resultType="com.wh.pojo.sysuser.SysUserVo">
+    <select id="selectPageVo" resultType="com.wh.controller.sysuser.SysUserVo">
         SELECT DISTINCT user.staffSid,
         user.isEnable,
         (
@@ -109,21 +109,21 @@
         </where>
     </select>
 
-    <select id="selectListAllVo" resultType="com.wh.pojo.sysuser.SysUserVo">
+    <select id="selectListAllVo" resultType="com.wh.controller.sysuser.SysUserVo">
         SELECT *
         FROM sys_user
         <where>
             ${ew.sqlSegment}
         </where>
     </select>
-    <select id="selectByUserName" resultType="com.wh.pojo.sysuser.SysUser">
+    <select id="selectByUserName" resultType="com.wh.controller.sysuser.SysUser">
         SELECT su.*
         FROM sys_user su
         where su.userName = #{param1}
           and su.isDelete = 0
     </select>
     <!--    and su.userType = 1      and si.personTypeKey != '01'-->
-    <select id="selectByUserNameApp" resultType="com.wh.pojo.sysuser.SysUser">
+    <select id="selectByUserNameApp" resultType="com.wh.controller.sysuser.SysUser">
         SELECT su.*
         FROM sys_user su
                  left join sys_staffinfo si on si.sid = su.staffSid
@@ -131,14 +131,14 @@
           and su.isDelete = 0
           and su.userType = 1
     </select>
-    <select id="selectByAppId" resultType="com.wh.pojo.sysuser.SysUser">
+    <select id="selectByAppId" resultType="com.wh.controller.sysuser.SysUser">
         SELECT *
         FROM sys_user
         where appId = #{appId}
           and isDelete = 0
           and userType = 1
     </select>
-    <select id="fetchByUserName" resultType="com.wh.pojo.sysuser.SysUser">
+    <select id="fetchByUserName" resultType="com.wh.controller.sysuser.SysUser">
         SELECT *
         FROM sys_user
         where userName = #{userName}
@@ -166,7 +166,7 @@
         where sid = #{param1}
     </delete>
     <!--根据手机号用户名和用户类型查询是否存在该用户-->
-    <select id="selectByMobileAndType" resultType="com.wh.pojo.sysuser.SysUser">
+    <select id="selectByMobileAndType" resultType="com.wh.controller.sysuser.SysUser">
         SELECT *
         FROM sys_user
         WHERE isDelete = 0
@@ -174,14 +174,14 @@
           AND userType = #{userType}
     </select>
     <!--客户端我的信息-->
-    <select id="selectMyInfo" resultType="com.wh.pojo.sysuser.wx.WxMySysUserInfoVo">
+    <select id="selectMyInfo" resultType="com.wh.controller.sysuser.wx.WxMySysUserInfoVo">
         SELECT su.headImage
         FROM sys_user su
         WHERE su.sid = #{userSid}
           AND su.isDelete = 0
     </select>
     <!--客户端根据用户名查询登录信息-->
-    <select id="selectByWxUserName" resultType="com.wh.pojo.sysuser.wx.WxSysUserVo">
+    <select id="selectByWxUserName" resultType="com.wh.controller.sysuser.wx.WxSysUserVo">
         SELECT su.mobile, su.userType, su.userName, su.sid userSid, su.staffSid, su.token
         FROM sys_user su
         WHERE su.userName = #{userName}
@@ -189,13 +189,13 @@
           AND su.isDelete = 0
     </select>
     <!--客户端查询首页信息-->
-    <select id="selectHomePage" resultType="com.wh.pojo.sysuser.wx.WxHomePageVo">
+    <select id="selectHomePage" resultType="com.wh.controller.sysuser.wx.WxHomePageVo">
         SELECT su.headImage, su.staffSid
         FROM sys_user su
         WHERE su.sid = #{userSid}
           AND su.isDelete = 0
     </select>
-    <select id="selectByStaffsid" resultType="com.wh.pojo.sysuser.SysUserVo">
+    <select id="selectByStaffsid" resultType="com.wh.controller.sysuser.SysUserVo">
         SELECT *
         FROM sys_user su
                  LEFT JOIN sys_staffinfo ss ON su.staffSid = ss.sid
@@ -203,7 +203,7 @@
           AND su.isDelete = 0
     </select>
     <!--根据用户sid获取员工sid-->
-    <select id="getUserOrgInfoByUserSid" resultType="com.wh.pojo.sysuser.app.AppUserOrgInfoVo">
+    <select id="getUserOrgInfoByUserSid" resultType="com.wh.controller.sysuser.app.AppUserOrgInfoVo">
         SELECT su.staffSid, ss.name staffName, sso.orgSid, sso.orgName, sso.orgSidPath, so.orgCode
         FROM sys_user su
                  LEFT JOIN sys_staffinfo ss ON su.staffSid = ss.sid
@@ -214,7 +214,7 @@
             LIMIT 1
     </select>
     <!--根据用户的sid查询用户的组织信息:多个时取第一个-->
-    <select id="selectUserInfoByUserSid" resultType="com.wh.pojo.sysuser.SysUserInfoVo">
+    <select id="selectUserInfoByUserSid" resultType="com.wh.controller.sysuser.SysUserInfoVo">
         SELECT su.staffSid, si.name staffName, sso.orgSid, sso.orgName, so.orgCode
         FROM sys_user su
                  LEFT JOIN sys_staffinfo si ON su.staffSid = si.sid
@@ -225,7 +225,7 @@
             LIMIT 1
     </select>
 
-    <select id="selectUserInfoByUserSidOne" resultType="com.wh.pojo.sysuser.SysUserInfoVo">
+    <select id="selectUserInfoByUserSidOne" resultType="com.wh.controller.sysuser.SysUserInfoVo">
         SELECT su.staffSid, si.name staffName, sso.orgSid, sso.orgName, so.orgCode
         FROM sys_user su
                  LEFT JOIN sys_staffinfo si ON su.staffSid = si.sid
@@ -249,7 +249,7 @@
         where staffSid = #{sid}
     </update>
 
-<!--    <select id="selectByMobile" resultType="com.wh.pojo.sysuser.SysUser">-->
+<!--    <select id="selectByMobile" resultType="com.wh.controller.sysuser.SysUser">-->
 <!--        select su.*-->
 <!--        from sys_user su-->
 <!--                 left join sys_staffinfo si on si.sid = su.staffSid-->
@@ -258,7 +258,7 @@
 <!--          and su.userType = 1-->
 <!--          and si.personTypeKey != '01'-->
 <!--    </select>-->
-    <select id="selectByMobile" resultType="com.wh.pojo.sysuser.SysUser">
+    <select id="selectByMobile" resultType="com.wh.controller.sysuser.SysUser">
         select su.*
         from sys_user su
                  left join sys_staffinfo si on si.sid = su.staffSid
@@ -271,7 +271,7 @@
         WHERE sid = #{sid}
     </update>
 
-    <select id="getUsersByRoleSid" resultType="com.wh.pojo.sysuser.SysUserVo">
+    <select id="getUsersByRoleSid" resultType="com.wh.controller.sysuser.SysUserVo">
         SELECT su.sid, ss.name, sso.orgNamePath departmentName
         FROM `sys_user` su
                  LEFT JOIN `sys_staffinfo` ss ON su.staffSid = ss.sid
@@ -281,7 +281,7 @@
         WHERE sr.sid = #{roleSid}
     </select>
 
-    <select id="getUserByRole" resultType="com.wh.pojo.sysuser.SysUserVo">
+    <select id="getUserByRole" resultType="com.wh.controller.sysuser.SysUserVo">
         select distinct si.name, su.sid, su.staffSid<!--, so.orgSidPath-->
         from sys_user_role sr
         left join sys_user su on sr.userSid = su.sid
@@ -291,7 +291,7 @@
         and find_in_set(#{levelOrgSid}, replace(so.orgSidPath, '/', ','))
         and si.personTypeKey != '01'
     </select>
-    <select id="getUserByRoleNoOrgPath" resultType="com.wh.pojo.sysuser.SysUserVo">
+    <select id="getUserByRoleNoOrgPath" resultType="com.wh.controller.sysuser.SysUserVo">
         select distinct si.name, su.sid, su.staffSid<!--, so.orgSidPath-->
         from sys_user_role sr
         left join sys_user su on sr.userSid = su.sid
@@ -320,7 +320,7 @@
             , '%')
     </select>
 
-    <select id="fetchBySids" resultType="com.wh.pojo.sysuser.SysUserVo">
+    <select id="fetchBySids" resultType="com.wh.controller.sysuser.SysUserVo">
         select su.*, ss.name
         from sys_user su
         left join sys_staffinfo ss on su.staffSid = ss.sid
@@ -330,7 +330,7 @@
         </foreach>
     </select>
 
-    <select id="getUserByRoleSid" resultType="com.wh.pojo.sysuser.SysUserVo">
+    <select id="getUserByRoleSid" resultType="com.wh.controller.sysuser.SysUserVo">
         select si.name, su.sid, su.staffSid
         from sys_user_role sr
                  left join sys_user su on sr.userSid = su.sid
@@ -358,7 +358,7 @@
         </foreach>
     </select>
 
-    <select id="getUserMessageByRole" resultType="com.wh.pojo.sysuser.SysUserVo">
+    <select id="getUserMessageByRole" resultType="com.wh.controller.sysuser.SysUserVo">
         select distinct si.name, su.sid, su.staffSid,so.orgSidPath
         from sys_user_role sr
         left join sys_user su on sr.userSid = su.sid
@@ -371,7 +371,7 @@
             #{item}
         </foreach>
     </select>
-    <select id="getUserByType" resultType="com.wh.pojo.sysuser.SysUserVo">
+    <select id="getUserByType" resultType="com.wh.controller.sysuser.SysUserVo">
         <if test="userType==1">
             select s.*,f.name as name from sys_user s left join sys_staffinfo f on f.sid=s.staffSid  where s.userType=#{userType}
         </if>
@@ -379,7 +379,7 @@
             select * from sys_user s  where s.userType=#{userType}
         </if>
     </select>
-    <select id="getUserOrgBySid" resultType="com.wh.pojo.sysuser.SysUserVo">
+    <select id="getUserOrgBySid" resultType="com.wh.controller.sysuser.SysUserVo">
         select s.*,f.name as name ,org.name as organizationName from sys_user s
             left join sys_staffinfo f on f.sid=s.staffSid
             left join sys_staff_org sta on sta.staffSid =f.sid