Browse Source

Merge remote-tracking branch 'origin/master'

master
wangpengfei 2 years ago
parent
commit
7a3fc44172
  1. 315
      warehousing-system/project/pom.xml
  2. 38
      warehousing-system/project/wh-common/pom.xml
  3. 18
      warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/ProjectInformationVo.java
  4. 77
      warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/SysUser.java
  5. 42
      warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/SysUserDto.java
  6. 30
      warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/SysUserInfoVo.java
  7. 19
      warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/SysUserListVo.java
  8. 51
      warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/SysUserQuery.java
  9. 15
      warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/SysUserUpdate.java
  10. 94
      warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/SysUserVo.java
  11. 21
      warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/UserQuery.java
  12. 19
      warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/UserRoleQuery.java
  13. 28
      warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/app/AppMySysUserInfo.java
  14. 34
      warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/app/AppUserOrgInfoVo.java
  15. 19
      warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/app/MyInfoQuery.java
  16. 17
      warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/app/OrgList.java
  17. 15
      warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/wx/SmsVerifyCodeQuery.java
  18. 15
      warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/wx/SysUserLoginVo.java
  19. 18
      warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/wx/SysUserWxBindMobileDto.java
  20. 27
      warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/wx/WxHomePageVo.java
  21. 23
      warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/wx/WxMySysUserInfoVo.java
  22. 33
      warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/wx/WxSysUserDto.java
  23. 29
      warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/wx/WxSysUserLoginQuery.java
  24. 38
      warehousing-system/project/wh-common/src/main/java/com/wh/pojo/sysuser/wx/WxSysUserVo.java
  25. 330
      warehousing-system/project/wh-manage-xxs/pom.xml
  26. 10
      warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/service/entinfo/EntInfoService.java
  27. 7
      warehousing-system/project/wh-manage-xxs/src/main/resources/application-devv.yml
  28. 7
      warehousing-system/project/wh-manage-xxs/src/main/resources/application-pro.yml
  29. 2
      warehousing-system/project/wh-manage-xxs/src/main/resources/application-test.yml
  30. 9
      warehousing-system/project/wh-manage-xxs/src/main/resources/application.yml
  31. 2
      warehousing-system/project/wh-manage-xxs/src/main/resources/logback-spring.xml
  32. 0
      warehousing-system/project_web_ui-xxs/.editorconfig
  33. 0
      warehousing-system/project_web_ui-xxs/.env.development
  34. 0
      warehousing-system/project_web_ui-xxs/.env.production
  35. 0
      warehousing-system/project_web_ui-xxs/.env.staging
  36. 0
      warehousing-system/project_web_ui-xxs/.eslintignore
  37. 0
      warehousing-system/project_web_ui-xxs/.eslintrc.js
  38. 0
      warehousing-system/project_web_ui-xxs/.gitignore
  39. 0
      warehousing-system/project_web_ui-xxs/.travis.yml
  40. 0
      warehousing-system/project_web_ui-xxs/LICENSE
  41. 0
      warehousing-system/project_web_ui-xxs/README-zh.md
  42. 0
      warehousing-system/project_web_ui-xxs/README.md
  43. 0
      warehousing-system/project_web_ui-xxs/babel.config.js
  44. 0
      warehousing-system/project_web_ui-xxs/jest.config.js
  45. 0
      warehousing-system/project_web_ui-xxs/jsconfig.json
  46. 0
      warehousing-system/project_web_ui-xxs/mock/index.js
  47. 0
      warehousing-system/project_web_ui-xxs/mock/mock-server.js
  48. 0
      warehousing-system/project_web_ui-xxs/mock/table.js
  49. 0
      warehousing-system/project_web_ui-xxs/mock/user.js
  50. 0
      warehousing-system/project_web_ui-xxs/mock/utils.js
  51. 0
      warehousing-system/project_web_ui-xxs/package.json
  52. 0
      warehousing-system/project_web_ui-xxs/pnpm-lock.yaml
  53. 0
      warehousing-system/project_web_ui-xxs/postcss.config.js
  54. 0
      warehousing-system/project_web_ui-xxs/public/favicon.ico
  55. 0
      warehousing-system/project_web_ui-xxs/public/faviconhr.ico
  56. 0
      warehousing-system/project_web_ui-xxs/public/image/liuchengtu.jpg
  57. 0
      warehousing-system/project_web_ui-xxs/public/index.html
  58. 0
      warehousing-system/project_web_ui-xxs/src/App.vue
  59. 0
      warehousing-system/project_web_ui-xxs/src/api/Common/Upload.js
  60. 0
      warehousing-system/project_web_ui-xxs/src/api/Common/areaPicker.js
  61. 0
      warehousing-system/project_web_ui-xxs/src/api/Common/permission.js
  62. 0
      warehousing-system/project_web_ui-xxs/src/api/Risk/index.js
  63. 0
      warehousing-system/project_web_ui-xxs/src/api/Risk/riskIndex.js
  64. 0
      warehousing-system/project_web_ui-xxs/src/api/User/login.js
  65. 0
      warehousing-system/project_web_ui-xxs/src/api/User/user.js
  66. 0
      warehousing-system/project_web_ui-xxs/src/api/flow/cunfangdidianbiangeng.js
  67. 0
      warehousing-system/project_web_ui-xxs/src/api/flow/flowable.js
  68. 0
      warehousing-system/project_web_ui-xxs/src/api/flow/tiaochekaipiaoshenqing.js
  69. 0
      warehousing-system/project_web_ui-xxs/src/api/flow/tiaozhangshenqing.js
  70. 0
      warehousing-system/project_web_ui-xxs/src/api/flow/todo.js
  71. 0
      warehousing-system/project_web_ui-xxs/src/api/flow/vehicleReturn.js
  72. 0
      warehousing-system/project_web_ui-xxs/src/api/system/Role/role.js
  73. 0
      warehousing-system/project_web_ui-xxs/src/api/system/Role/roleManage.js
  74. 0
      warehousing-system/project_web_ui-xxs/src/api/system/basefkManage/index.js
  75. 0
      warehousing-system/project_web_ui-xxs/src/api/system/dataDict/dataDict.js
  76. 0
      warehousing-system/project_web_ui-xxs/src/api/system/departments/departments.js
  77. 0
      warehousing-system/project_web_ui-xxs/src/api/system/dictType/dictCommon.js
  78. 0
      warehousing-system/project_web_ui-xxs/src/api/system/dictType/index.js
  79. 0
      warehousing-system/project_web_ui-xxs/src/api/system/functional/functional.js
  80. 0
      warehousing-system/project_web_ui-xxs/src/api/system/log/index.js
  81. 0
      warehousing-system/project_web_ui-xxs/src/api/system/menu/index.js
  82. 0
      warehousing-system/project_web_ui-xxs/src/api/system/organization/organization.js
  83. 0
      warehousing-system/project_web_ui-xxs/src/api/system/postManage/index.js
  84. 0
      warehousing-system/project_web_ui-xxs/src/api/system/roleAdminister/index.js
  85. 0
      warehousing-system/project_web_ui-xxs/src/api/system/roleAdminister/rolemenus.js
  86. 0
      warehousing-system/project_web_ui-xxs/src/api/system/roleMenus/index.js
  87. 0
      warehousing-system/project_web_ui-xxs/src/api/system/sources/index.js
  88. 0
      warehousing-system/project_web_ui-xxs/src/api/system/user/Auser.js
  89. 0
      warehousing-system/project_web_ui-xxs/src/api/system/user/login.js
  90. 0
      warehousing-system/project_web_ui-xxs/src/api/system/user/user.js
  91. 0
      warehousing-system/project_web_ui-xxs/src/api/system/userAdminister/client.js
  92. 0
      warehousing-system/project_web_ui-xxs/src/api/system/userAdminister/index.js
  93. 0
      warehousing-system/project_web_ui-xxs/src/api/system/userManage/index.js
  94. 0
      warehousing-system/project_web_ui-xxs/src/api/user.js
  95. 0
      warehousing-system/project_web_ui-xxs/src/assets/404_images/404.png
  96. 0
      warehousing-system/project_web_ui-xxs/src/assets/404_images/404_cloud.png
  97. 0
      warehousing-system/project_web_ui-xxs/src/assets/home/anrui.png
  98. 0
      warehousing-system/project_web_ui-xxs/src/assets/home/bIcon1.png
  99. 0
      warehousing-system/project_web_ui-xxs/src/assets/home/bIcon2.png
  100. 0
      warehousing-system/project_web_ui-xxs/src/assets/home/bIcon3.png

315
warehousing-system/project/pom.xml

@ -8,326 +8,11 @@
<version>1.0-SNAPSHOT</version>
<modules>
<module>wh-manage</module>
<module>wh-common</module>
<module>wh-manage-xxs</module>
</modules>
<!--指定打包方式 jar/war/pom聚合工程 -->
<packaging>pom</packaging>
<properties>
<!-- 使用的JAVA版本号 -->
<java.version>1.8</java.version>
<!-- 项目构建编码 -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<!-- 项目输出编码 -->
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<!-- Spring相关组件 -->
<!-- SpringBoot 依赖配置 -->
<spring-boot.version>2.2.9.RELEASE</spring-boot.version>
<!-- SpringCloud 微服务 -->
<spring-cloud.version>Hoxton.SR6</spring-cloud.version>
<!-- SpringCloud Alibaba 微服务 -->
<spring-cloud-alibaba.version>2.2.1.RELEASE</spring-cloud-alibaba.version>
<!-- springboot管理界面
<spring-boot-admin.version>2.2.3</spring-boot-admin.version>-->
<!-- nacos客户端 -->
<nacos.version>1.3.0</nacos.version>
<!-- 公共的基础组件 -->
<!-- io常用工具类 -->
<commons.io.version>2.5</commons.io.version>
<commons-codec.version>1.14</commons-codec.version>
<!--Bean工具 -->
<commons.beanutils.version>1.9.3</commons.beanutils.version>
<!-- 线程池工具 -->
<common-pool.version>2.6.2</common-pool.version>
<!-- mybatis,mybatis-plus已经引用
<spring-boot.mybatis>2.1.2</spring-boot.mybatis>-->
<!-- mybatis-plus -->
<mybatis-plus.version>3.4.0</mybatis-plus.version>
<!-- JSON 解析器和生成器 -->
<fastjson.version>1.2.73</fastjson.version>
<!--Token生成与解析 -->
<jjwt.version>0.9.1</jjwt.version>
<!-- 辅助组件 -->
<!-- Swagger 依赖配置 -->
<swagger.fox.version>2.9.2</swagger.fox.version>
<knife4j-Swagger>2.0.5</knife4j-Swagger>
<!-- <knife4j-Swagger>3.0.3</knife4j-Swagger>-->
<!-- excel工具 -->
<poi.version>3.17</poi.version>
<!-- 验证码 -->
<kaptcha.version>2.3.2</kaptcha.version>
<!-- 解析客户端操作系统、浏览器等 -->
<bitwalker.version>1.19</bitwalker.version>
<!-- velocity模板引擎 -->
<velocity.version>1.7</velocity.version>
<!-- Hutool组件 -->
<hutool.version>5.4.0</hutool.version>
<hibernate-validator.version>6.0.20.Final</hibernate-validator.version>
<lombok.version>1.18.12</lombok.version>
<jedis.version>3.1.0</jedis.version>
<java-jwt.version>3.10.1</java-jwt.version>
<redis.version>2.2.9.RELEASE</redis.version>
<poi-tl.version>1.8.1</poi-tl.version>
<poi.version>4.1.2</poi.version>
<flowable.version>6.5.0</flowable.version>
</properties>
<!-- 依赖声明 -->
<dependencyManagement>
<dependencies>
<!-- SpringBoot 依赖配置 -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>${spring-boot.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<!-- SpringCloud 微服务 -->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dependencies</artifactId>
<version>${spring-cloud.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<!-- SpringCloud Alibaba 微服务 -->
<dependency>
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-alibaba-dependencies</artifactId>
<version>${spring-cloud-alibaba.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<!-- Alibaba Nacos 配置 -->
<dependency>
<groupId>com.alibaba.nacos</groupId>
<artifactId>nacos-client</artifactId>
<version>${nacos.version}</version>
</dependency>
<!--Redis配置-->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-redis</artifactId>
<version>${redis.version}</version>
<exclusions>
<exclusion>
<groupId>io.lettuce</groupId>
<artifactId>lettuce-core</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- https://mvnrepository.com/artifact/com.auth0/java-jwt -->
<dependency>
<groupId>com.auth0</groupId>
<artifactId>java-jwt</artifactId>
<version>${java-jwt.version}</version>
</dependency>
<!-- https://mvnrepository.com/artifact/redis.clients/jedis -->
<dependency>
<groupId>redis.clients</groupId>
<artifactId>jedis</artifactId>
<version>${jedis.version}</version>
</dependency>
<!-- io常用工具类 -->
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>${commons.io.version}</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>${commons-codec.version}</version>
</dependency>
<!--Bean工具 -->
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
<version>${commons.beanutils.version}</version>
</dependency>
<!-- 公共资源池 -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-pool2</artifactId>
<version>${common-pool.version}</version>
</dependency>
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-boot-starter</artifactId>
<version>${mybatis-plus.version}</version>
</dependency>
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-annotation</artifactId>
<version>${mybatis-plus.version}</version>
</dependency>
<!-- JSON 解析器和生成器 -->
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<version>${fastjson.version}</version>
</dependency>
<!--Token生成与解析 -->
<dependency>
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt</artifactId>
<version>${jjwt.version}</version>
</dependency>
<!-- Swagger 依赖配置 -->
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId>
<version>${swagger.fox.version}</version>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger-ui</artifactId>
<version>${swagger.fox.version}</version>
</dependency>
<dependency>
<groupId>com.github.xiaoymin</groupId>
<artifactId>knife4j-dependencies</artifactId>
<version>${knife4j-Swagger}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<!-- <dependency>
<groupId>com.github.xiaoymin</groupId>
<artifactId>knife4j-spring-ui</artifactId>
<version>${knife4j-Swagger}</version>
</dependency>
<dependency>
<groupId>com.github.xiaoymin</groupId>
<artifactId>knife4j-micro-spring-boot-starter</artifactId>
<version>${knife4j-Swagger}</version>
</dependency>
<dependency>
<groupId>com.github.xiaoymin</groupId>
<artifactId>knife4j-spring-boot-starter</artifactId>
<version>${knife4j-Swagger}</version>
</dependency>-->
<!-- excel工具 -->
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId>
<version>${poi.version}</version>
</dependency>
<!-- 验证码 -->
<dependency>
<groupId>com.github.penggle</groupId>
<artifactId>kaptcha</artifactId>
<version>${kaptcha.version}</version>
</dependency>
<!-- 解析客户端操作系统、浏览器等 -->
<!-- <dependency>-->
<!-- <groupId>eu.bitwalker</groupId>-->
<!-- <artifactId>UserAgentUtils</artifactId>-->
<!-- <version>${bitwalker.version}</version>-->
<!-- </dependency>-->
<!-- 代码生成使用模板 -->
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
<version>${velocity.version}</version>
</dependency>
<!-- hutool所有模块 -->
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-all</artifactId>
<version>${hutool.version}</version>
</dependency>
<!-- hutool 核心,包括Bean操作、日期、各种Util等 -->
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-core</artifactId>
<version>${hutool.version}</version>
</dependency>
<!-- hutool 基于HttpUrlConnection的Http客户端封装 -->
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-http</artifactId>
<version>${hutool.version}</version>
</dependency>
<!-- hutool 加密解密模块,提供对称、非对称和摘要算法封装 -->
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-crypto</artifactId>
<version>${hutool.version}</version>
</dependency>
<!-- hutool 简单缓存实现 -->
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-cache</artifactId>
<version>${hutool.version}</version>
</dependency>
<!-- hutool 功能更强大的Setting配置文件和Properties封装 -->
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-setting</artifactId>
<version>${hutool.version}</version>
</dependency>
<!-- hutool 扩展模块,对第三方封装(模板引擎、邮件、Servlet、二维码、Emoji、FTP、分词等) -->
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-extra</artifactId>
<version>${hutool.version}</version>
</dependency>
<!-- hutool 自动识别日志实现的日志门面 -->
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-log</artifactId>
<version>${hutool.version}</version>
</dependency>
<dependency>
<groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator</artifactId>
<version>${hibernate-validator.version}</version>
<scope>compile</scope>
</dependency>
<!-- https://mvnrepository.com/artifact/org.apache.poi/poi -->
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi</artifactId>
<version>${poi.version}</version>
</dependency>
<!--flowable组件-->
<dependency>
<groupId>org.flowable</groupId>
<artifactId>flowable-engine</artifactId>
<version>${flowable.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.flowable</groupId>
<artifactId>flowable-spring-boot-starter-basic</artifactId>
<version>${flowable.version}</version>
<exclusions><!-- 需要排除flowable的mybatis依赖,不然会跟mybatis-plus冲突 -->
<exclusion>
<groupId>org.mybatis</groupId>
<artifactId>mybatis</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
</dependencyManagement>
<!--父级工程是一种结构 没有java代码 不需要执行运行,所以不需要build标签-->
</project>

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

@ -1,38 +0,0 @@
<?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>

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

@ -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;
}

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

@ -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(门户建设) <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;
}

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

@ -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(门户建设) <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;
}

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

@ -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;
}

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

@ -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;
}

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

@ -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(门户建设) <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;
}

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

@ -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;
}

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

@ -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(门户建设) <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;
}

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

@ -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;
}

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

@ -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;
}

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

@ -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;
}

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

@ -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;
}

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

@ -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;
}

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

@ -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;
}

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

@ -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;
}

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

@ -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;
}

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

@ -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;
}

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

@ -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;
}

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

@ -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;
}

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

@ -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;
}

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

@ -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;
}

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

@ -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;
}

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

@ -2,22 +2,306 @@
<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>
<groupId>com.wh</groupId>
<version>1.0</version>
<artifactId>wh-manage-xxs</artifactId>
<modelVersion>4.0.0</modelVersion>
<properties>
<!-- 使用的JAVA版本号 -->
<java.version>1.8</java.version>
<!-- 项目构建编码 -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<!-- 项目输出编码 -->
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<!-- Spring相关组件 -->
<!-- SpringBoot 依赖配置 -->
<spring-boot.version>2.2.9.RELEASE</spring-boot.version>
<!-- SpringCloud 微服务 -->
<spring-cloud.version>Hoxton.SR6</spring-cloud.version>
<!-- SpringCloud Alibaba 微服务 -->
<spring-cloud-alibaba.version>2.2.1.RELEASE</spring-cloud-alibaba.version>
<!-- springboot管理界面
<spring-boot-admin.version>2.2.3</spring-boot-admin.version>-->
<!-- nacos客户端 -->
<nacos.version>1.3.0</nacos.version>
<!-- 公共的基础组件 -->
<!-- io常用工具类 -->
<commons.io.version>2.5</commons.io.version>
<commons-codec.version>1.14</commons-codec.version>
<!--Bean工具 -->
<commons.beanutils.version>1.9.3</commons.beanutils.version>
<!-- 线程池工具 -->
<common-pool.version>2.6.2</common-pool.version>
<!-- mybatis,mybatis-plus已经引用
<spring-boot.mybatis>2.1.2</spring-boot.mybatis>-->
<!-- mybatis-plus -->
<mybatis-plus.version>3.4.0</mybatis-plus.version>
<!-- JSON 解析器和生成器 -->
<fastjson.version>1.2.73</fastjson.version>
<!--Token生成与解析 -->
<jjwt.version>0.9.1</jjwt.version>
<!-- 辅助组件 -->
<!-- Swagger 依赖配置 -->
<swagger.fox.version>2.9.2</swagger.fox.version>
<knife4j-Swagger>2.0.5</knife4j-Swagger>
<!-- <knife4j-Swagger>3.0.3</knife4j-Swagger>-->
<!-- excel工具 -->
<poi.version>3.17</poi.version>
<!-- 验证码 -->
<kaptcha.version>2.3.2</kaptcha.version>
<!-- 解析客户端操作系统、浏览器等 -->
<bitwalker.version>1.19</bitwalker.version>
<!-- velocity模板引擎 -->
<velocity.version>1.7</velocity.version>
<!-- Hutool组件 -->
<hutool.version>5.4.0</hutool.version>
<hibernate-validator.version>6.0.20.Final</hibernate-validator.version>
<lombok.version>1.18.12</lombok.version>
<jedis.version>3.1.0</jedis.version>
<java-jwt.version>3.10.1</java-jwt.version>
<redis.version>2.2.9.RELEASE</redis.version>
<poi-tl.version>1.8.1</poi-tl.version>
<poi.version>4.1.2</poi.version>
</properties>
<!-- 依赖声明 -->
<dependencyManagement>
<dependencies>
<!-- SpringBoot 依赖配置 -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>${spring-boot.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<!-- SpringCloud 微服务 -->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dependencies</artifactId>
<version>${spring-cloud.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<!-- SpringCloud Alibaba 微服务 -->
<dependency>
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-alibaba-dependencies</artifactId>
<version>${spring-cloud-alibaba.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<!-- Alibaba Nacos 配置 -->
<dependency>
<groupId>com.alibaba.nacos</groupId>
<artifactId>nacos-client</artifactId>
<version>${nacos.version}</version>
</dependency>
<!--Redis配置-->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-redis</artifactId>
<version>${redis.version}</version>
<exclusions>
<exclusion>
<groupId>io.lettuce</groupId>
<artifactId>lettuce-core</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- https://mvnrepository.com/artifact/com.auth0/java-jwt -->
<dependency>
<groupId>com.auth0</groupId>
<artifactId>java-jwt</artifactId>
<version>${java-jwt.version}</version>
</dependency>
<!-- https://mvnrepository.com/artifact/redis.clients/jedis -->
<dependency>
<groupId>redis.clients</groupId>
<artifactId>jedis</artifactId>
<version>${jedis.version}</version>
</dependency>
<!-- io常用工具类 -->
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>${commons.io.version}</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>${commons-codec.version}</version>
</dependency>
<!--Bean工具 -->
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
<version>${commons.beanutils.version}</version>
</dependency>
<!-- 公共资源池 -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-pool2</artifactId>
<version>${common-pool.version}</version>
</dependency>
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-boot-starter</artifactId>
<version>${mybatis-plus.version}</version>
</dependency>
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-annotation</artifactId>
<version>${mybatis-plus.version}</version>
</dependency>
<!-- JSON 解析器和生成器 -->
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<version>${fastjson.version}</version>
</dependency>
<!--Token生成与解析 -->
<dependency>
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt</artifactId>
<version>${jjwt.version}</version>
</dependency>
<!-- Swagger 依赖配置 -->
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId>
<version>${swagger.fox.version}</version>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger-ui</artifactId>
<version>${swagger.fox.version}</version>
</dependency>
<dependency>
<groupId>com.github.xiaoymin</groupId>
<artifactId>knife4j-dependencies</artifactId>
<version>${knife4j-Swagger}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<!-- <dependency>
<groupId>com.github.xiaoymin</groupId>
<artifactId>knife4j-spring-ui</artifactId>
<version>${knife4j-Swagger}</version>
</dependency>
<dependency>
<groupId>com.github.xiaoymin</groupId>
<artifactId>knife4j-micro-spring-boot-starter</artifactId>
<version>${knife4j-Swagger}</version>
</dependency>
<dependency>
<groupId>com.github.xiaoymin</groupId>
<artifactId>knife4j-spring-boot-starter</artifactId>
<version>${knife4j-Swagger}</version>
</dependency>-->
<!-- excel工具 -->
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId>
<version>${poi.version}</version>
</dependency>
<!-- 验证码 -->
<dependency>
<groupId>com.github.penggle</groupId>
<artifactId>kaptcha</artifactId>
<version>${kaptcha.version}</version>
</dependency>
<!-- 解析客户端操作系统、浏览器等 -->
<!-- <dependency>-->
<!-- <groupId>eu.bitwalker</groupId>-->
<!-- <artifactId>UserAgentUtils</artifactId>-->
<!-- <version>${bitwalker.version}</version>-->
<!-- </dependency>-->
<!-- 代码生成使用模板 -->
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
<version>${velocity.version}</version>
</dependency>
<!-- hutool所有模块 -->
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-all</artifactId>
<version>${hutool.version}</version>
</dependency>
<!-- hutool 核心,包括Bean操作、日期、各种Util等 -->
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-core</artifactId>
<version>${hutool.version}</version>
</dependency>
<!-- hutool 基于HttpUrlConnection的Http客户端封装 -->
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-http</artifactId>
<version>${hutool.version}</version>
</dependency>
<!-- hutool 加密解密模块,提供对称、非对称和摘要算法封装 -->
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-crypto</artifactId>
<version>${hutool.version}</version>
</dependency>
<!-- hutool 简单缓存实现 -->
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-cache</artifactId>
<version>${hutool.version}</version>
</dependency>
<!-- hutool 功能更强大的Setting配置文件和Properties封装 -->
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-setting</artifactId>
<version>${hutool.version}</version>
</dependency>
<!-- hutool 扩展模块,对第三方封装(模板引擎、邮件、Servlet、二维码、Emoji、FTP、分词等) -->
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-extra</artifactId>
<version>${hutool.version}</version>
</dependency>
<!-- hutool 自动识别日志实现的日志门面 -->
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-log</artifactId>
<version>${hutool.version}</version>
</dependency>
<dependency>
<groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator</artifactId>
<version>${hibernate-validator.version}</version>
<scope>compile</scope>
</dependency>
<!-- https://mvnrepository.com/artifact/org.apache.poi/poi -->
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi</artifactId>
<version>${poi.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
<!-- 依赖工具API-->
<dependencies>
<!-- <dependency>-->
<!-- <groupId>com.wh</groupId>-->
<!-- <artifactId>wh-common</artifactId>-->
<!-- <version>1.0</version>-->
<!-- </dependency>-->
<dependency>
<groupId>org.jetbrains</groupId>
<artifactId>annotations</artifactId>
@ -33,24 +317,14 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-cache</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-openfeign</artifactId>
</dependency>
<!-- <dependency>-->
<!-- <groupId>com.yxt.supervise.dispatchcenter</groupId>-->
<!-- <artifactId>supervise-dispatchcenter-api</artifactId>-->
<!-- <version>0.0.1</version>-->
<!-- <groupId>com.alibaba.cloud</groupId>-->
<!-- <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.springframework.cloud</groupId>-->
<!-- <artifactId>spring-cloud-starter-openfeign</artifactId>-->
<!-- </dependency>-->
<dependency>
<groupId>com.yxt</groupId>
<artifactId>yxt-common-base</artifactId>
<version>0.0.1</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>com.alibaba.cloud</groupId>-->
<!-- <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>-->
<!-- </dependency>-->
<dependency>
<groupId>org.projectlombok</groupId>
@ -102,7 +376,7 @@
<!--添加build标签-->
<build>
<!--打包成jar包时的名字-->
<finalName>wm-manager</finalName>
<finalName>wm-manage-xxs</finalName>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>

10
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(仓储) <br/>
* File: EntInfoService.java <br/>

7
warehousing-system/project/wh-manage-xxs/src/main/resources/application-devv.yml

@ -1,14 +1,9 @@
spring:
resources:
static-locations: file:D://supervise
cloud:
nacos:
discovery:
server-addr: 127.0.0.1:8848
datasource:
url: jdbc:mysql://127.0.0.1:3306/warehouse2?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&autoReconnect=true&allowMultiQueries=true
username: root
#password: 1LAiGz$t1*Iw
password: root
redis:
database: 3 # Redis数据库索引(默认为0)
@ -19,6 +14,6 @@ spring:
max-idle: 8 #连接池中的最大空闲连接
max-wait: -1 # 连接池最大阻塞等待时间(使用负值表示没有限制)
min-idle: 0 # 连接池中的最小空闲连接
password: 123456
password:
port: 6379
timeout: 0 # 连接超时时间(毫秒)

7
warehousing-system/project/wh-manage-xxs/src/main/resources/application-pro.yml

@ -1,15 +1,10 @@
spring:
resources:
static-locations: file:D://supervise
cloud:
nacos:
discovery:
server-addr: 127.0.0.1:8848
datasource:
url: jdbc:mysql://127.0.0.1:3306/warehouse2?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&autoReconnect=true&allowMultiQueries=true
url: jdbc:mysql://127.0.0.1:3306/warehouse_xxs?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&autoReconnect=true&allowMultiQueries=true
username: root
password: 1LAiGz$t1*Iw
#password: root
redis:
database: 3 # Redis数据库索引(默认为0)

2
warehousing-system/project/wh-manage-xxs/src/main/resources/application-test.yml

@ -1,12 +1,10 @@
spring:
resources:
static-locations: file:D://supervise
datasource:
url: jdbc:mysql://39.104.100.138:3306/warehouse_xxs?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&autoReconnect=true&allowMultiQueries=true
username: root
password: yxt_mysql_138
#password: root
redis:
database: 3 # Redis数据库索引(默认为0)

9
warehousing-system/project/wh-manage-xxs/src/main/resources/application.yml

@ -1,5 +1,5 @@
server:
port: 9050
port: 9051
servlet:
context-path: /
multipart:
@ -8,10 +8,11 @@ server:
max-request-size: 200MB
spring:
application:
name: supervise-wm
name: supervise-wm-xxs
profiles:
active: test
#active: pro
active: devv
# active: test
# active: pro
messages:
basename: i18n/messages

2
warehousing-system/project/wh-manage-xxs/src/main/resources/logback-spring.xml

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<property name="log.base" value="logs/supervise-warehousing" />
<property name="log.base" value="logs/supervise-wm-xxs" />
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder>

0
warehousing-system/project_web_ui - xxs/.editorconfig → warehousing-system/project_web_ui-xxs/.editorconfig

0
warehousing-system/project_web_ui - xxs/.env.development → warehousing-system/project_web_ui-xxs/.env.development

0
warehousing-system/project_web_ui - xxs/.env.production → warehousing-system/project_web_ui-xxs/.env.production

0
warehousing-system/project_web_ui - xxs/.env.staging → warehousing-system/project_web_ui-xxs/.env.staging

0
warehousing-system/project_web_ui - xxs/.eslintignore → warehousing-system/project_web_ui-xxs/.eslintignore

0
warehousing-system/project_web_ui - xxs/.eslintrc.js → warehousing-system/project_web_ui-xxs/.eslintrc.js

0
warehousing-system/project_web_ui - xxs/.gitignore → warehousing-system/project_web_ui-xxs/.gitignore

0
warehousing-system/project_web_ui - xxs/.travis.yml → warehousing-system/project_web_ui-xxs/.travis.yml

0
warehousing-system/project_web_ui - xxs/LICENSE → warehousing-system/project_web_ui-xxs/LICENSE

0
warehousing-system/project_web_ui - xxs/README-zh.md → warehousing-system/project_web_ui-xxs/README-zh.md

0
warehousing-system/project_web_ui - xxs/README.md → warehousing-system/project_web_ui-xxs/README.md

0
warehousing-system/project_web_ui - xxs/babel.config.js → warehousing-system/project_web_ui-xxs/babel.config.js

0
warehousing-system/project_web_ui - xxs/jest.config.js → warehousing-system/project_web_ui-xxs/jest.config.js

0
warehousing-system/project_web_ui - xxs/jsconfig.json → warehousing-system/project_web_ui-xxs/jsconfig.json

0
warehousing-system/project_web_ui - xxs/mock/index.js → warehousing-system/project_web_ui-xxs/mock/index.js

0
warehousing-system/project_web_ui - xxs/mock/mock-server.js → warehousing-system/project_web_ui-xxs/mock/mock-server.js

0
warehousing-system/project_web_ui - xxs/mock/table.js → warehousing-system/project_web_ui-xxs/mock/table.js

0
warehousing-system/project_web_ui - xxs/mock/user.js → warehousing-system/project_web_ui-xxs/mock/user.js

0
warehousing-system/project_web_ui - xxs/mock/utils.js → warehousing-system/project_web_ui-xxs/mock/utils.js

0
warehousing-system/project_web_ui - xxs/package.json → warehousing-system/project_web_ui-xxs/package.json

0
warehousing-system/project_web_ui - xxs/pnpm-lock.yaml → warehousing-system/project_web_ui-xxs/pnpm-lock.yaml

0
warehousing-system/project_web_ui - xxs/postcss.config.js → warehousing-system/project_web_ui-xxs/postcss.config.js

0
warehousing-system/project_web_ui - xxs/public/favicon.ico → warehousing-system/project_web_ui-xxs/public/favicon.ico

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

0
warehousing-system/project_web_ui - xxs/public/faviconhr.ico → warehousing-system/project_web_ui-xxs/public/faviconhr.ico

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB

0
warehousing-system/project_web_ui - xxs/public/image/liuchengtu.jpg → warehousing-system/project_web_ui-xxs/public/image/liuchengtu.jpg

Before

Width:  |  Height:  |  Size: 30 KiB

After

Width:  |  Height:  |  Size: 30 KiB

0
warehousing-system/project_web_ui - xxs/public/index.html → warehousing-system/project_web_ui-xxs/public/index.html

0
warehousing-system/project_web_ui - xxs/src/App.vue → warehousing-system/project_web_ui-xxs/src/App.vue

0
warehousing-system/project_web_ui - xxs/src/api/Common/Upload.js → warehousing-system/project_web_ui-xxs/src/api/Common/Upload.js

0
warehousing-system/project_web_ui - xxs/src/api/Common/areaPicker.js → warehousing-system/project_web_ui-xxs/src/api/Common/areaPicker.js

0
warehousing-system/project_web_ui - xxs/src/api/Common/permission.js → warehousing-system/project_web_ui-xxs/src/api/Common/permission.js

0
warehousing-system/project_web_ui - xxs/src/api/Risk/index.js → warehousing-system/project_web_ui-xxs/src/api/Risk/index.js

0
warehousing-system/project_web_ui - xxs/src/api/Risk/riskIndex.js → warehousing-system/project_web_ui-xxs/src/api/Risk/riskIndex.js

0
warehousing-system/project_web_ui - xxs/src/api/User/login.js → warehousing-system/project_web_ui-xxs/src/api/User/login.js

0
warehousing-system/project_web_ui - xxs/src/api/User/user.js → warehousing-system/project_web_ui-xxs/src/api/User/user.js

0
warehousing-system/project_web_ui - xxs/src/api/flow/cunfangdidianbiangeng.js → warehousing-system/project_web_ui-xxs/src/api/flow/cunfangdidianbiangeng.js

0
warehousing-system/project_web_ui - xxs/src/api/flow/flowable.js → warehousing-system/project_web_ui-xxs/src/api/flow/flowable.js

0
warehousing-system/project_web_ui - xxs/src/api/flow/tiaochekaipiaoshenqing.js → warehousing-system/project_web_ui-xxs/src/api/flow/tiaochekaipiaoshenqing.js

0
warehousing-system/project_web_ui - xxs/src/api/flow/tiaozhangshenqing.js → warehousing-system/project_web_ui-xxs/src/api/flow/tiaozhangshenqing.js

0
warehousing-system/project_web_ui - xxs/src/api/flow/todo.js → warehousing-system/project_web_ui-xxs/src/api/flow/todo.js

0
warehousing-system/project_web_ui - xxs/src/api/flow/vehicleReturn.js → warehousing-system/project_web_ui-xxs/src/api/flow/vehicleReturn.js

0
warehousing-system/project_web_ui - xxs/src/api/system/Role/role.js → warehousing-system/project_web_ui-xxs/src/api/system/Role/role.js

0
warehousing-system/project_web_ui - xxs/src/api/system/Role/roleManage.js → warehousing-system/project_web_ui-xxs/src/api/system/Role/roleManage.js

0
warehousing-system/project_web_ui - xxs/src/api/system/basefkManage/index.js → warehousing-system/project_web_ui-xxs/src/api/system/basefkManage/index.js

0
warehousing-system/project_web_ui - xxs/src/api/system/dataDict/dataDict.js → warehousing-system/project_web_ui-xxs/src/api/system/dataDict/dataDict.js

0
warehousing-system/project_web_ui - xxs/src/api/system/departments/departments.js → warehousing-system/project_web_ui-xxs/src/api/system/departments/departments.js

0
warehousing-system/project_web_ui - xxs/src/api/system/dictType/dictCommon.js → warehousing-system/project_web_ui-xxs/src/api/system/dictType/dictCommon.js

0
warehousing-system/project_web_ui - xxs/src/api/system/dictType/index.js → warehousing-system/project_web_ui-xxs/src/api/system/dictType/index.js

0
warehousing-system/project_web_ui - xxs/src/api/system/functional/functional.js → warehousing-system/project_web_ui-xxs/src/api/system/functional/functional.js

0
warehousing-system/project_web_ui - xxs/src/api/system/log/index.js → warehousing-system/project_web_ui-xxs/src/api/system/log/index.js

0
warehousing-system/project_web_ui - xxs/src/api/system/menu/index.js → warehousing-system/project_web_ui-xxs/src/api/system/menu/index.js

0
warehousing-system/project_web_ui - xxs/src/api/system/organization/organization.js → warehousing-system/project_web_ui-xxs/src/api/system/organization/organization.js

0
warehousing-system/project_web_ui - xxs/src/api/system/postManage/index.js → warehousing-system/project_web_ui-xxs/src/api/system/postManage/index.js

0
warehousing-system/project_web_ui - xxs/src/api/system/roleAdminister/index.js → warehousing-system/project_web_ui-xxs/src/api/system/roleAdminister/index.js

0
warehousing-system/project_web_ui - xxs/src/api/system/roleAdminister/rolemenus.js → warehousing-system/project_web_ui-xxs/src/api/system/roleAdminister/rolemenus.js

0
warehousing-system/project_web_ui - xxs/src/api/system/roleMenus/index.js → warehousing-system/project_web_ui-xxs/src/api/system/roleMenus/index.js

0
warehousing-system/project_web_ui - xxs/src/api/system/sources/index.js → warehousing-system/project_web_ui-xxs/src/api/system/sources/index.js

0
warehousing-system/project_web_ui - xxs/src/api/system/user/Auser.js → warehousing-system/project_web_ui-xxs/src/api/system/user/Auser.js

0
warehousing-system/project_web_ui - xxs/src/api/system/user/login.js → warehousing-system/project_web_ui-xxs/src/api/system/user/login.js

0
warehousing-system/project_web_ui - xxs/src/api/system/user/user.js → warehousing-system/project_web_ui-xxs/src/api/system/user/user.js

0
warehousing-system/project_web_ui - xxs/src/api/system/userAdminister/client.js → warehousing-system/project_web_ui-xxs/src/api/system/userAdminister/client.js

0
warehousing-system/project_web_ui - xxs/src/api/system/userAdminister/index.js → warehousing-system/project_web_ui-xxs/src/api/system/userAdminister/index.js

0
warehousing-system/project_web_ui - xxs/src/api/system/userManage/index.js → warehousing-system/project_web_ui-xxs/src/api/system/userManage/index.js

0
warehousing-system/project_web_ui - xxs/src/api/user.js → warehousing-system/project_web_ui-xxs/src/api/user.js

0
warehousing-system/project_web_ui - xxs/src/assets/404_images/404.png → warehousing-system/project_web_ui-xxs/src/assets/404_images/404.png

Before

Width:  |  Height:  |  Size: 96 KiB

After

Width:  |  Height:  |  Size: 96 KiB

0
warehousing-system/project_web_ui - xxs/src/assets/404_images/404_cloud.png → warehousing-system/project_web_ui-xxs/src/assets/404_images/404_cloud.png

Before

Width:  |  Height:  |  Size: 4.7 KiB

After

Width:  |  Height:  |  Size: 4.7 KiB

0
warehousing-system/project_web_ui - xxs/src/assets/home/anrui.png → warehousing-system/project_web_ui-xxs/src/assets/home/anrui.png

Before

Width:  |  Height:  |  Size: 97 KiB

After

Width:  |  Height:  |  Size: 97 KiB

0
warehousing-system/project_web_ui - xxs/src/assets/home/bIcon1.png → warehousing-system/project_web_ui-xxs/src/assets/home/bIcon1.png

Before

Width:  |  Height:  |  Size: 5.5 KiB

After

Width:  |  Height:  |  Size: 5.5 KiB

0
warehousing-system/project_web_ui - xxs/src/assets/home/bIcon2.png → warehousing-system/project_web_ui-xxs/src/assets/home/bIcon2.png

Before

Width:  |  Height:  |  Size: 8.4 KiB

After

Width:  |  Height:  |  Size: 8.4 KiB

0
warehousing-system/project_web_ui - xxs/src/assets/home/bIcon3.png → warehousing-system/project_web_ui-xxs/src/assets/home/bIcon3.png

Before

Width:  |  Height:  |  Size: 7.4 KiB

After

Width:  |  Height:  |  Size: 7.4 KiB

Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save