diff --git a/warehousing-system/project/pom.xml b/warehousing-system/project/pom.xml index d957d41c..cd33aa58 100644 --- a/warehousing-system/project/pom.xml +++ b/warehousing-system/project/pom.xml @@ -8,326 +8,11 @@ 1.0-SNAPSHOT wh-manage - wh-common wh-manage-xxs pom - - - 1.8 - - UTF-8 - - UTF-8 - 1.8 - 1.8 - - - - 2.2.9.RELEASE - - Hoxton.SR6 - - 2.2.1.RELEASE - - - 1.3.0 - - - - 2.5 - 1.14 - - 1.9.3 - - 2.6.2 - - - 3.4.0 - - 1.2.73 - - 0.9.1 - - - - 2.9.2 - 2.0.5 - - - 3.17 - - 2.3.2 - - 1.19 - - 1.7 - - - - 5.4.0 - 6.0.20.Final - 1.18.12 - 3.1.0 - 3.10.1 - 2.2.9.RELEASE - 1.8.1 - 4.1.2 - 6.5.0 - - - - - - - - - - - org.springframework.boot - spring-boot-dependencies - ${spring-boot.version} - pom - import - - - - org.springframework.cloud - spring-cloud-dependencies - ${spring-cloud.version} - pom - import - - - - com.alibaba.cloud - spring-cloud-alibaba-dependencies - ${spring-cloud-alibaba.version} - pom - import - - - - com.alibaba.nacos - nacos-client - ${nacos.version} - - - - org.springframework.boot - spring-boot-starter-data-redis - ${redis.version} - - - io.lettuce - lettuce-core - - - - - - com.auth0 - java-jwt - ${java-jwt.version} - - - - redis.clients - jedis - ${jedis.version} - - - - commons-io - commons-io - ${commons.io.version} - - - commons-codec - commons-codec - ${commons-codec.version} - - - - commons-beanutils - commons-beanutils - ${commons.beanutils.version} - - - - org.apache.commons - commons-pool2 - ${common-pool.version} - - - com.baomidou - mybatis-plus-boot-starter - ${mybatis-plus.version} - - - com.baomidou - mybatis-plus-annotation - ${mybatis-plus.version} - - - - com.alibaba - fastjson - ${fastjson.version} - - - - io.jsonwebtoken - jjwt - ${jjwt.version} - - - - - io.springfox - springfox-swagger2 - ${swagger.fox.version} - - - io.springfox - springfox-swagger-ui - ${swagger.fox.version} - - - com.github.xiaoymin - knife4j-dependencies - ${knife4j-Swagger} - pom - import - - - - - org.apache.poi - poi-ooxml - ${poi.version} - - - - com.github.penggle - kaptcha - ${kaptcha.version} - - - - - - - - - - org.apache.velocity - velocity - ${velocity.version} - - - - - cn.hutool - hutool-all - ${hutool.version} - - - - cn.hutool - hutool-core - ${hutool.version} - - - - cn.hutool - hutool-http - ${hutool.version} - - - - cn.hutool - hutool-crypto - ${hutool.version} - - - - cn.hutool - hutool-cache - ${hutool.version} - - - - - cn.hutool - hutool-setting - ${hutool.version} - - - - cn.hutool - hutool-extra - ${hutool.version} - - - - - cn.hutool - hutool-log - ${hutool.version} - - - org.hibernate.validator - hibernate-validator - ${hibernate-validator.version} - compile - - - - org.apache.poi - poi - ${poi.version} - - - - org.flowable - flowable-engine - ${flowable.version} - compile - - - - org.flowable - flowable-spring-boot-starter-basic - ${flowable.version} - - - org.mybatis - mybatis - - - - - - \ No newline at end of file diff --git a/warehousing-system/project/wh-common/pom.xml b/warehousing-system/project/wh-common/pom.xml deleted file mode 100644 index 931bec7d..00000000 --- a/warehousing-system/project/wh-common/pom.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - wh - com.wh - 1.0-SNAPSHOT - - 4.0.0 - 1.0 - com.wh - wh-common - - - com.yxt - yxt-common-core - 0.0.1 - - - org.projectlombok - lombok - true - 1.18.20 - - - io.springfox - springfox-swagger2 - 2.9.2 - - - io.springfox - springfox-swagger-ui - 2.9.2 - - - - \ No newline at end of file diff --git a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/ProjectInformationVo.java b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/ProjectInformationVo.java deleted file mode 100644 index 3759a9f2..00000000 --- a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/ProjectInformationVo.java +++ /dev/null @@ -1,18 +0,0 @@ -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; -} diff --git a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/SysUser.java b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/SysUser.java deleted file mode 100644 index 8aca9ab1..00000000 --- a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/SysUser.java +++ /dev/null @@ -1,77 +0,0 @@ -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(门户建设)
- * File: SysUser.java
- * Class: SysUser
- * Description: 用户表.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2021-08-03 00:24:30
- * - * @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 roleNames; - private String unionid; - //d订阅状态 - private String subscriptionStatus; -} diff --git a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/SysUserDto.java b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/SysUserDto.java deleted file mode 100644 index 427ed1ff..00000000 --- a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/SysUserDto.java +++ /dev/null @@ -1,42 +0,0 @@ -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(门户建设)
- * File: SysUserDto.java
- * Class: SysUserDto
- * Description: 用户表 数据传输对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2021-08-03 00:24:30
- * - * @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; -} \ No newline at end of file diff --git a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/SysUserInfoVo.java b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/SysUserInfoVo.java deleted file mode 100644 index 17098e45..00000000 --- a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/SysUserInfoVo.java +++ /dev/null @@ -1,30 +0,0 @@ -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; -} diff --git a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/SysUserListVo.java b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/SysUserListVo.java deleted file mode 100644 index 10a1e5a7..00000000 --- a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/SysUserListVo.java +++ /dev/null @@ -1,19 +0,0 @@ -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; - -} diff --git a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/SysUserQuery.java b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/SysUserQuery.java deleted file mode 100644 index f0ad61e7..00000000 --- a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/SysUserQuery.java +++ /dev/null @@ -1,51 +0,0 @@ -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(门户建设)
- * File: SysUserQuery.java
- * Class: SysUserQuery
- * Description: 用户表 查询条件.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2021-08-03 00:24:30
- * - * @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; -} \ No newline at end of file diff --git a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/SysUserUpdate.java b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/SysUserUpdate.java deleted file mode 100644 index 11f650db..00000000 --- a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/SysUserUpdate.java +++ /dev/null @@ -1,15 +0,0 @@ -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; -} diff --git a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/SysUserVo.java b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/SysUserVo.java deleted file mode 100644 index a7ccf9a9..00000000 --- a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/SysUserVo.java +++ /dev/null @@ -1,94 +0,0 @@ -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(门户建设)
- * File: SysUserVo.java
- * Class: SysUserVo
- * Description: 用户表 视图数据对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2021-08-03 00:24:30
- * - * @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 roleSids = new ArrayList<>(); - - private String defaultOrgPath; - private String defaultOrgPathName; - - @ApiModelProperty("是否需要更换密码") - private Boolean needResetPsd; - @ApiModelProperty("工号") - private String jobNumber; - private String openid; - @ApiModelProperty("项目sid集合") - private List projectSidList; -} diff --git a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/UserQuery.java b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/UserQuery.java deleted file mode 100644 index 8e1d4419..00000000 --- a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/UserQuery.java +++ /dev/null @@ -1,21 +0,0 @@ -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; - -} diff --git a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/UserRoleQuery.java b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/UserRoleQuery.java deleted file mode 100644 index 5ca2fef3..00000000 --- a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/UserRoleQuery.java +++ /dev/null @@ -1,19 +0,0 @@ -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; -} diff --git a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/app/AppMySysUserInfo.java b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/app/AppMySysUserInfo.java deleted file mode 100644 index 1597df85..00000000 --- a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/app/AppMySysUserInfo.java +++ /dev/null @@ -1,28 +0,0 @@ -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; -} diff --git a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/app/AppUserOrgInfoVo.java b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/app/AppUserOrgInfoVo.java deleted file mode 100644 index 286d87df..00000000 --- a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/app/AppUserOrgInfoVo.java +++ /dev/null @@ -1,34 +0,0 @@ -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; -} diff --git a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/app/MyInfoQuery.java b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/app/MyInfoQuery.java deleted file mode 100644 index d990df2c..00000000 --- a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/app/MyInfoQuery.java +++ /dev/null @@ -1,19 +0,0 @@ -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; -} diff --git a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/app/OrgList.java b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/app/OrgList.java deleted file mode 100644 index 01e62aa2..00000000 --- a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/app/OrgList.java +++ /dev/null @@ -1,17 +0,0 @@ -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; -} diff --git a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/wx/SmsVerifyCodeQuery.java b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/wx/SmsVerifyCodeQuery.java deleted file mode 100644 index ea2b4bf4..00000000 --- a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/wx/SmsVerifyCodeQuery.java +++ /dev/null @@ -1,15 +0,0 @@ -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; -} diff --git a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/wx/SysUserLoginVo.java b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/wx/SysUserLoginVo.java deleted file mode 100644 index c7b91b55..00000000 --- a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/wx/SysUserLoginVo.java +++ /dev/null @@ -1,15 +0,0 @@ -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; -} diff --git a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/wx/SysUserWxBindMobileDto.java b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/wx/SysUserWxBindMobileDto.java deleted file mode 100644 index b3d0b0b7..00000000 --- a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/wx/SysUserWxBindMobileDto.java +++ /dev/null @@ -1,18 +0,0 @@ -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; -} diff --git a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/wx/WxHomePageVo.java b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/wx/WxHomePageVo.java deleted file mode 100644 index 939464a2..00000000 --- a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/wx/WxHomePageVo.java +++ /dev/null @@ -1,27 +0,0 @@ -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; -} diff --git a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/wx/WxMySysUserInfoVo.java b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/wx/WxMySysUserInfoVo.java deleted file mode 100644 index 15aa1331..00000000 --- a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/wx/WxMySysUserInfoVo.java +++ /dev/null @@ -1,23 +0,0 @@ -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; -} diff --git a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/wx/WxSysUserDto.java b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/wx/WxSysUserDto.java deleted file mode 100644 index 5acbbd28..00000000 --- a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/wx/WxSysUserDto.java +++ /dev/null @@ -1,33 +0,0 @@ -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; - -} diff --git a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/wx/WxSysUserLoginQuery.java b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/wx/WxSysUserLoginQuery.java deleted file mode 100644 index 92ab5b5b..00000000 --- a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/wx/WxSysUserLoginQuery.java +++ /dev/null @@ -1,29 +0,0 @@ -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; -} diff --git a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/wx/WxSysUserVo.java b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/wx/WxSysUserVo.java deleted file mode 100644 index aae56693..00000000 --- a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/wx/WxSysUserVo.java +++ /dev/null @@ -1,38 +0,0 @@ -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; -} diff --git a/warehousing-system/project/wh-manage-xxs/pom.xml b/warehousing-system/project/wh-manage-xxs/pom.xml index b933677b..1d6ab21f 100644 --- a/warehousing-system/project/wh-manage-xxs/pom.xml +++ b/warehousing-system/project/wh-manage-xxs/pom.xml @@ -2,22 +2,306 @@ - - wh - com.wh - 1.0-SNAPSHOT - - 4.0.0 + com.wh + 1.0 wh-manage-xxs + 4.0.0 + + + + + 1.8 + + UTF-8 + + UTF-8 + 1.8 + 1.8 + + + + 2.2.9.RELEASE + + Hoxton.SR6 + + 2.2.1.RELEASE + + + 1.3.0 + + + + 2.5 + 1.14 + + 1.9.3 + + 2.6.2 + + + 3.4.0 + + 1.2.73 + + 0.9.1 + + + + 2.9.2 + 2.0.5 + + + 3.17 + + 2.3.2 + + 1.19 + + 1.7 + + + + 5.4.0 + 6.0.20.Final + 1.18.12 + 3.1.0 + 3.10.1 + 2.2.9.RELEASE + 1.8.1 + 4.1.2 + + + + + + + + + org.springframework.boot + spring-boot-dependencies + ${spring-boot.version} + pom + import + + + + org.springframework.cloud + spring-cloud-dependencies + ${spring-cloud.version} + pom + import + + + + com.alibaba.cloud + spring-cloud-alibaba-dependencies + ${spring-cloud-alibaba.version} + pom + import + + + + com.alibaba.nacos + nacos-client + ${nacos.version} + + + + org.springframework.boot + spring-boot-starter-data-redis + ${redis.version} + + + io.lettuce + lettuce-core + + + + + + com.auth0 + java-jwt + ${java-jwt.version} + + + + redis.clients + jedis + ${jedis.version} + + + + commons-io + commons-io + ${commons.io.version} + + + commons-codec + commons-codec + ${commons-codec.version} + + + + commons-beanutils + commons-beanutils + ${commons.beanutils.version} + + + + org.apache.commons + commons-pool2 + ${common-pool.version} + + + com.baomidou + mybatis-plus-boot-starter + ${mybatis-plus.version} + + + com.baomidou + mybatis-plus-annotation + ${mybatis-plus.version} + + + + com.alibaba + fastjson + ${fastjson.version} + + + + io.jsonwebtoken + jjwt + ${jjwt.version} + + + + io.springfox + springfox-swagger2 + ${swagger.fox.version} + + + io.springfox + springfox-swagger-ui + ${swagger.fox.version} + + + com.github.xiaoymin + knife4j-dependencies + ${knife4j-Swagger} + pom + import + + + + + org.apache.poi + poi-ooxml + ${poi.version} + + + + com.github.penggle + kaptcha + ${kaptcha.version} + + + + + + + + + + org.apache.velocity + velocity + ${velocity.version} + + + + + cn.hutool + hutool-all + ${hutool.version} + + + + cn.hutool + hutool-core + ${hutool.version} + + + + cn.hutool + hutool-http + ${hutool.version} + + + + cn.hutool + hutool-crypto + ${hutool.version} + + + + cn.hutool + hutool-cache + ${hutool.version} + + + + + cn.hutool + hutool-setting + ${hutool.version} + + + + cn.hutool + hutool-extra + ${hutool.version} + + + + + cn.hutool + hutool-log + ${hutool.version} + + + org.hibernate.validator + hibernate-validator + ${hibernate-validator.version} + compile + + + + org.apache.poi + poi + ${poi.version} + + + - - - - - org.jetbrains annotations @@ -33,24 +317,14 @@ org.springframework.boot spring-boot-starter-cache - - org.springframework.cloud - spring-cloud-starter-openfeign - - - - + + + + + + - - com.yxt - yxt-common-base - 0.0.1 - - - - - org.projectlombok @@ -102,7 +376,7 @@ - wm-manager + wm-manage-xxs org.springframework.boot diff --git a/warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/service/entinfo/EntInfoService.java b/warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/service/entinfo/EntInfoService.java index fda1afc0..a132f574 100644 --- a/warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/service/entinfo/EntInfoService.java +++ b/warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/service/entinfo/EntInfoService.java @@ -30,19 +30,13 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.wh.mapper.entinfo.EntInfoMapper; import com.wh.pojo.entinfo.*; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; -import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import org.apache.commons.lang3.StringUtils; -import com.yxt.common.base.service.MybatisBaseService; -import com.yxt.common.base.utils.PagerUtil; - -import org.springframework.cloud.openfeign.FeignClient; import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import java.util.List; - /** * Project: warehouse(仓储)
* File: EntInfoService.java