<%= webpackConfig.name %>

commit 701eb95f03374f4023577a53b7d2da12a206acdc Author: yovinchen Date: Thu Sep 14 17:16:49 2023 +0800 实现用户角色权限区域管理模块 diff --git a/.idea/$PROJECT_FILE$ b/.idea/$PROJECT_FILE$ new file mode 100644 index 0000000..58b7e3e --- /dev/null +++ b/.idea/$PROJECT_FILE$ @@ -0,0 +1,11 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..afa4cd3 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,10 @@ +# 默认忽略的文件 +/shelf/ +/workspace.xml +# 基于编辑器的 HTTP 客户端请求 +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml +# Zeppelin 忽略的文件 +/ZeppelinRemoteNotebooks/ diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..edcdac6 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml new file mode 100644 index 0000000..2187d97 --- /dev/null +++ b/.idea/dataSources.xml @@ -0,0 +1,13 @@ + + + + + mysql.8 + true + 区域仓库表 + com.mysql.cj.jdbc.Driver + jdbc:mysql://82.157.68.223:3306/shequ-sys + $ProjectFileDir$ + + + \ No newline at end of file diff --git a/.idea/easyCodeTableSetting.xml b/.idea/easyCodeTableSetting.xml new file mode 100644 index 0000000..5b98952 --- /dev/null +++ b/.idea/easyCodeTableSetting.xml @@ -0,0 +1,68 @@ + + + + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..643613d --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/git_toolbox_prj.xml b/.idea/git_toolbox_prj.xml new file mode 100644 index 0000000..02b915b --- /dev/null +++ b/.idea/git_toolbox_prj.xml @@ -0,0 +1,15 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 0000000..03d9549 --- /dev/null +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 0000000..8c84b40 --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/jpa-buddy.xml b/.idea/jpa-buddy.xml new file mode 100644 index 0000000..966d5f5 --- /dev/null +++ b/.idea/jpa-buddy.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..81e27d4 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,227 @@ + + + + + + + + UPDATE + false + true + + FIELD + TYPE + METHOD + + + PROTECTED + PUBLIC + DEFAULT + + + + + + ^.*(public|protected|private)*.+interface\s+\w+.* + /**\n + * The interface ${name}.\n +<#if element.typeParameters?has_content> * \n +</#if> +<#list element.typeParameters as typeParameter> + * @param <${typeParameter.name}> the type parameter\n +</#list> + */ + + + ^.*(public|protected|private)*.+enum\s+\w+.* + /**\n + * The enum ${name}.\n + */ + + + ^.*(public|protected|private)*.+class\s+\w+.* + /**\n + * The type ${name}.\n +<#if element.typeParameters?has_content> * \n +</#if> +<#list element.typeParameters as typeParameter> + * @param <${typeParameter.name}> the type parameter\n +</#list> + */ + + + .+ + /**\n + * The type ${name}.\n + */ + + + + + .+ + /**\n + * Instantiates a new ${name}.\n +<#if element.parameterList.parameters?has_content> + *\n +</#if> +<#list element.parameterList.parameters as parameter> + * @param ${parameter.name} the ${paramNames[parameter.name]}\n +</#list> +<#if element.throwsList.referenceElements?has_content> + *\n +</#if> +<#list element.throwsList.referenceElements as exception> + * @throws ${exception.referenceName} the ${exceptionNames[exception.referenceName]}\n +</#list> + */ + + + + + ^.*(public|protected|private)*\s*.*(\w(\s*<.+>)*)+\s+get\w+\s*$.*$.+ + /**\n + * Gets ${partName}.\n +<#if element.typeParameters?has_content> * \n +</#if> +<#list element.typeParameters as typeParameter> + * @param <${typeParameter.name}> the type parameter\n +</#list> +<#if element.parameterList.parameters?has_content> + *\n +</#if> +<#list element.parameterList.parameters as parameter> + * @param ${parameter.name} the ${paramNames[parameter.name]}\n +</#list> +<#if isNotVoid> + *\n + * @return the ${partName}\n +</#if> +<#if element.throwsList.referenceElements?has_content> + *\n +</#if> +<#list element.throwsList.referenceElements as exception> + * @throws ${exception.referenceName} the ${exceptionNames[exception.referenceName]}\n +</#list> + */ + + + ^.*(public|protected|private)*\s*.*(void|\w(\s*<.+>)*)+\s+set\w+\s*$.*$.+ + /**\n + * Sets ${partName}.\n +<#if element.typeParameters?has_content> * \n +</#if> +<#list element.typeParameters as typeParameter> + * @param <${typeParameter.name}> the type parameter\n +</#list> +<#if element.parameterList.parameters?has_content> + *\n +</#if> +<#list element.parameterList.parameters as parameter> + * @param ${parameter.name} the ${paramNames[parameter.name]}\n +</#list> +<#if isNotVoid> + *\n + * @return the ${partName}\n +</#if> +<#if element.throwsList.referenceElements?has_content> + *\n +</#if> +<#list element.throwsList.referenceElements as exception> + * @throws ${exception.referenceName} the ${exceptionNames[exception.referenceName]}\n +</#list> + */ + + + ^.*((public\s+static)|(static\s+public))\s+void\s+main\s*$\s*String\s*(\[\s*\]|\.\.\.)\s+\w+\s*$.+ + /**\n + * The entry point of application.\n + + <#if element.parameterList.parameters?has_content> + *\n +</#if> + * @param ${element.parameterList.parameters[0].name} the input arguments\n +<#if element.throwsList.referenceElements?has_content> + *\n +</#if> +<#list element.throwsList.referenceElements as exception> + * @throws ${exception.referenceName} the ${exceptionNames[exception.referenceName]}\n +</#list> + */ + + + .+ + /**\n + * ${name}<#if isNotVoid> ${return}</#if>.\n +<#if element.typeParameters?has_content> * \n +</#if> +<#list element.typeParameters as typeParameter> + * @param <${typeParameter.name}> the type parameter\n +</#list> +<#if element.parameterList.parameters?has_content> + *\n +</#if> +<#list element.parameterList.parameters as parameter> + * @param ${parameter.name} the ${paramNames[parameter.name]}\n +</#list> +<#if isNotVoid> + *\n + * @return the ${return}\n +</#if> +<#if element.throwsList.referenceElements?has_content> + *\n +</#if> +<#list element.throwsList.referenceElements as exception> + * @throws ${exception.referenceName} the ${exceptionNames[exception.referenceName]}\n +</#list> + */ + + + + + ^.*(public|protected|private)*.+static.*(\w\s\w)+.+ + /**\n + * The constant ${element.getName()}.\n + */ + + + ^.*(public|protected|private)*.*(\w\s\w)+.+ + /**\n + <#if element.parent.isInterface()> + * The constant ${element.getName()}.\n +<#else> + * The ${name}.\n +</#if> */ + + + .+ + /**\n + <#if element.parent.isEnum()> + *${name} ${typeName}.\n +<#else> + * The ${name}.\n +</#if>*/ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..62a1e94 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/mybatisx/templates.xml b/.idea/mybatisx/templates.xml new file mode 100644 index 0000000..bc5f75a --- /dev/null +++ b/.idea/mybatisx/templates.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/.idea/qaplug_profiles.xml b/.idea/qaplug_profiles.xml new file mode 100644 index 0000000..3dfd21f --- /dev/null +++ b/.idea/qaplug_profiles.xml @@ -0,0 +1,465 @@ + + + + + \ No newline at end of file diff --git a/.idea/ssyx.iml b/.idea/ssyx.iml new file mode 100644 index 0000000..d6ebd48 --- /dev/null +++ b/.idea/ssyx.iml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml new file mode 100644 index 0000000..2b63946 --- /dev/null +++ b/.idea/uiDesigner.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..47c9172 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/guigu-ssyx-parent/.gitignore b/guigu-ssyx-parent/.gitignore new file mode 100644 index 0000000..5ff6309 --- /dev/null +++ b/guigu-ssyx-parent/.gitignore @@ -0,0 +1,38 @@ +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### IntelliJ IDEA ### +.idea/modules.xml +.idea/jarRepositories.xml +.idea/compiler.xml +.idea/libraries/ +*.iws +*.iml +*.ipr + +### Eclipse ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ + +### Mac OS ### +.DS_Store \ No newline at end of file diff --git a/guigu-ssyx-parent/.idea/codeStyles/codeStyleConfig.xml b/guigu-ssyx-parent/.idea/codeStyles/codeStyleConfig.xml new file mode 100644 index 0000000..a55e7a1 --- /dev/null +++ b/guigu-ssyx-parent/.idea/codeStyles/codeStyleConfig.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/guigu-ssyx-parent/.idea/encodings.xml b/guigu-ssyx-parent/.idea/encodings.xml new file mode 100644 index 0000000..51dac36 --- /dev/null +++ b/guigu-ssyx-parent/.idea/encodings.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/guigu-ssyx-parent/.idea/git_toolbox_prj.xml b/guigu-ssyx-parent/.idea/git_toolbox_prj.xml new file mode 100644 index 0000000..02b915b --- /dev/null +++ b/guigu-ssyx-parent/.idea/git_toolbox_prj.xml @@ -0,0 +1,15 @@ + + + + + + + \ No newline at end of file diff --git a/guigu-ssyx-parent/.idea/inspectionProfiles/Project_Default.xml b/guigu-ssyx-parent/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 0000000..f4ca084 --- /dev/null +++ b/guigu-ssyx-parent/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,8 @@ + + + + \ No newline at end of file diff --git a/guigu-ssyx-parent/.idea/jpa-buddy.xml b/guigu-ssyx-parent/.idea/jpa-buddy.xml new file mode 100644 index 0000000..966d5f5 --- /dev/null +++ b/guigu-ssyx-parent/.idea/jpa-buddy.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/guigu-ssyx-parent/.idea/misc.xml b/guigu-ssyx-parent/.idea/misc.xml new file mode 100644 index 0000000..dad6fd5 --- /dev/null +++ b/guigu-ssyx-parent/.idea/misc.xml @@ -0,0 +1,227 @@ + + + + + + + + UPDATE + false + true + + FIELD + TYPE + METHOD + + + PROTECTED + PUBLIC + DEFAULT + + + + + + ^.*(public|protected|private)*.+interface\s+\w+.* + /**\n + * The interface ${name}.\n +<#if element.typeParameters?has_content> * \n +</#if> +<#list element.typeParameters as typeParameter> + * @param <${typeParameter.name}> the type parameter\n +</#list> + */ + + + ^.*(public|protected|private)*.+enum\s+\w+.* + /**\n + * The enum ${name}.\n + */ + + + ^.*(public|protected|private)*.+class\s+\w+.* + /**\n + * The type ${name}.\n +<#if element.typeParameters?has_content> * \n +</#if> +<#list element.typeParameters as typeParameter> + * @param <${typeParameter.name}> the type parameter\n +</#list> + */ + + + .+ + /**\n + * The type ${name}.\n + */ + + + + + .+ + /**\n + * Instantiates a new ${name}.\n +<#if element.parameterList.parameters?has_content> + *\n +</#if> +<#list element.parameterList.parameters as parameter> + * @param ${parameter.name} the ${paramNames[parameter.name]}\n +</#list> +<#if element.throwsList.referenceElements?has_content> + *\n +</#if> +<#list element.throwsList.referenceElements as exception> + * @throws ${exception.referenceName} the ${exceptionNames[exception.referenceName]}\n +</#list> + */ + + + + + ^.*(public|protected|private)*\s*.*(\w(\s*<.+>)*)+\s+get\w+\s*$.*$.+ + /**\n + * Gets ${partName}.\n +<#if element.typeParameters?has_content> * \n +</#if> +<#list element.typeParameters as typeParameter> + * @param <${typeParameter.name}> the type parameter\n +</#list> +<#if element.parameterList.parameters?has_content> + *\n +</#if> +<#list element.parameterList.parameters as parameter> + * @param ${parameter.name} the ${paramNames[parameter.name]}\n +</#list> +<#if isNotVoid> + *\n + * @return the ${partName}\n +</#if> +<#if element.throwsList.referenceElements?has_content> + *\n +</#if> +<#list element.throwsList.referenceElements as exception> + * @throws ${exception.referenceName} the ${exceptionNames[exception.referenceName]}\n +</#list> + */ + + + ^.*(public|protected|private)*\s*.*(void|\w(\s*<.+>)*)+\s+set\w+\s*$.*$.+ + /**\n + * Sets ${partName}.\n +<#if element.typeParameters?has_content> * \n +</#if> +<#list element.typeParameters as typeParameter> + * @param <${typeParameter.name}> the type parameter\n +</#list> +<#if element.parameterList.parameters?has_content> + *\n +</#if> +<#list element.parameterList.parameters as parameter> + * @param ${parameter.name} the ${paramNames[parameter.name]}\n +</#list> +<#if isNotVoid> + *\n + * @return the ${partName}\n +</#if> +<#if element.throwsList.referenceElements?has_content> + *\n +</#if> +<#list element.throwsList.referenceElements as exception> + * @throws ${exception.referenceName} the ${exceptionNames[exception.referenceName]}\n +</#list> + */ + + + ^.*((public\s+static)|(static\s+public))\s+void\s+main\s*$\s*String\s*(\[\s*\]|\.\.\.)\s+\w+\s*$.+ + /**\n + * The entry point of application.\n + + <#if element.parameterList.parameters?has_content> + *\n +</#if> + * @param ${element.parameterList.parameters[0].name} the input arguments\n +<#if element.throwsList.referenceElements?has_content> + *\n +</#if> +<#list element.throwsList.referenceElements as exception> + * @throws ${exception.referenceName} the ${exceptionNames[exception.referenceName]}\n +</#list> + */ + + + .+ + /**\n + * ${name}<#if isNotVoid> ${return}</#if>.\n +<#if element.typeParameters?has_content> * \n +</#if> +<#list element.typeParameters as typeParameter> + * @param <${typeParameter.name}> the type parameter\n +</#list> +<#if element.parameterList.parameters?has_content> + *\n +</#if> +<#list element.parameterList.parameters as parameter> + * @param ${parameter.name} the ${paramNames[parameter.name]}\n +</#list> +<#if isNotVoid> + *\n + * @return the ${return}\n +</#if> +<#if element.throwsList.referenceElements?has_content> + *\n +</#if> +<#list element.throwsList.referenceElements as exception> + * @throws ${exception.referenceName} the ${exceptionNames[exception.referenceName]}\n +</#list> + */ + + + + + ^.*(public|protected|private)*.+static.*(\w\s\w)+.+ + /**\n + * The constant ${element.getName()}.\n + */ + + + ^.*(public|protected|private)*.*(\w\s\w)+.+ + /**\n + <#if element.parent.isInterface()> + * The constant ${element.getName()}.\n +<#else> + * The ${name}.\n +</#if> */ + + + .+ + /**\n + <#if element.parent.isEnum()> + *${name} ${typeName}.\n +<#else> + * The ${name}.\n +</#if>*/ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/guigu-ssyx-parent/.idea/qaplug_profiles.xml b/guigu-ssyx-parent/.idea/qaplug_profiles.xml new file mode 100644 index 0000000..3dfd21f --- /dev/null +++ b/guigu-ssyx-parent/.idea/qaplug_profiles.xml @@ -0,0 +1,465 @@ + + + + + \ No newline at end of file diff --git a/guigu-ssyx-parent/.idea/uiDesigner.xml b/guigu-ssyx-parent/.idea/uiDesigner.xml new file mode 100644 index 0000000..2b63946 --- /dev/null +++ b/guigu-ssyx-parent/.idea/uiDesigner.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/guigu-ssyx-parent/.idea/vcs.xml b/guigu-ssyx-parent/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/guigu-ssyx-parent/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/guigu-ssyx-parent/.idea/workspace.xml b/guigu-ssyx-parent/.idea/workspace.xml new file mode 100644 index 0000000..dc5bab1 --- /dev/null +++ b/guigu-ssyx-parent/.idea/workspace.xml @@ -0,0 +1,167 @@ + + + + + + + + + + + + + + + { + "associatedIndex": 5 +} + + + + + + + + + + + + + + + + + + + + + + + + + + + + $USER_HOME$/.subversion + + + + + 1694573773215 + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/guigu-ssyx-parent/common/common-util/pom.xml b/guigu-ssyx-parent/common/common-util/pom.xml new file mode 100644 index 0000000..66c2049 --- /dev/null +++ b/guigu-ssyx-parent/common/common-util/pom.xml @@ -0,0 +1,42 @@ + + + 4.0.0 + + com.atguigu + common + 1.0-SNAPSHOT + + + common-util + + + org.apache.httpcomponents + httpclient + + + + io.jsonwebtoken + jjwt + + + + joda-time + joda-time + + + + com.atguigu + model + 1.0-SNAPSHOT + provided + + + + 8 + 8 + UTF-8 + + + diff --git a/guigu-ssyx-parent/common/common-util/src/main/java/com/atguigu/ssyx/common/utils/MD5.java b/guigu-ssyx-parent/common/common-util/src/main/java/com/atguigu/ssyx/common/utils/MD5.java new file mode 100644 index 0000000..262bdbe --- /dev/null +++ b/guigu-ssyx-parent/common/common-util/src/main/java/com/atguigu/ssyx/common/utils/MD5.java @@ -0,0 +1,32 @@ +package com.atguigu.ssyx.common.utils; + +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; + + +public final class MD5 { + + public static String encrypt(String strSrc) { + try { + char[] hexChars = {'0', '1', '2', '3', '4', '5', '6', '7', '8', + '9', 'a', 'b', 'c', 'd', 'e', 'f'}; + byte[] bytes = strSrc.getBytes(); + MessageDigest md = MessageDigest.getInstance("MD5"); + md.update(bytes); + bytes = md.digest(); + int j = bytes.length; + char[] chars = new char[j * 2]; + int k = 0; + for (int i = 0; i < bytes.length; i++) { + byte b = bytes[i]; + chars[k++] = hexChars[b >>> 4 & 0xf]; + chars[k++] = hexChars[b & 0xf]; + } + return new String(chars); + } catch (NoSuchAlgorithmException e) { + e.printStackTrace(); + throw new RuntimeException("MD5加密出错！！+" + e); + } + } + +} diff --git a/guigu-ssyx-parent/common/pom.xml b/guigu-ssyx-parent/common/pom.xml new file mode 100644 index 0000000..c31f9ee --- /dev/null +++ b/guigu-ssyx-parent/common/pom.xml @@ -0,0 +1,59 @@ + + + 4.0.0 + + com.atguigu + guigu-ssyx-parent + 1.0-SNAPSHOT + + + common + pom + + common-util + service-util + + + + + org.springframework.boot + spring-boot-starter-web + provided + + + + org.projectlombok + lombok + + + + com.github.xiaoymin + knife4j-spring-boot-starter + + + + + com.alibaba + fastjson + + + + + org.springframework.cloud + spring-cloud-starter-openfeign + provided + + + com.github.xiaoymin + knife4j-spring-boot-starter + + + + 8 + 8 + UTF-8 + + + diff --git a/guigu-ssyx-parent/common/service-util/pom.xml b/guigu-ssyx-parent/common/service-util/pom.xml new file mode 100644 index 0000000..a9938dc --- /dev/null +++ b/guigu-ssyx-parent/common/service-util/pom.xml @@ -0,0 +1,75 @@ + + + 4.0.0 + + com.atguigu + common + 1.0-SNAPSHOT + + + service-util + + + + com.atguigu + common-util + 1.0-SNAPSHOT + + + + + org.springframework.boot + spring-boot-starter-data-redis + + + + + org.apache.commons + commons-pool2 + 2.6.0 + + + + + org.redisson + redisson + 3.11.2 + + + + + com.baomidou + mybatis-plus-boot-starter + provided + + + com.atguigu + model + 1.0-SNAPSHOT + compile + + + + com.baomidou + mybatis-plus-generator + 3.4.1 + + + mysql + mysql-connector-java + + + org.apache.velocity + velocity-engine-core + 2.0 + + + + 8 + 8 + UTF-8 + + + diff --git a/guigu-ssyx-parent/common/service-util/src/main/java/com/atguigu/ssyx/common/config/MybatisPlusConfig.java b/guigu-ssyx-parent/common/service-util/src/main/java/com/atguigu/ssyx/common/config/MybatisPlusConfig.java new file mode 100644 index 0000000..9d35e79 --- /dev/null +++ b/guigu-ssyx-parent/common/service-util/src/main/java/com/atguigu/ssyx/common/config/MybatisPlusConfig.java @@ -0,0 +1,34 @@ +package com.atguigu.ssyx.common.config; + +import com.baomidou.mybatisplus.annotation.DbType; +import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; +import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; +import org.mybatis.spring.annotation.MapperScan; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.transaction.annotation.EnableTransactionManagement; + +/** + * ClassName: MyBatisPlusConfig + * Package: com.atguigu.ssyx.common.config + * MybatisPlus配置类 + * + * @author yovinchen + * @Create 2023/9/13 12:56 + */ +@EnableTransactionManagement +@Configuration +@MapperScan("com.atguigu.ssyx.*.mapper") +public class MybatisPlusConfig { + + /** + * mp插件 + */ + @Bean + public MybatisPlusInterceptor optimisticLockerInnerInterceptor() { + MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor(); + //向Mybatis过滤器链中添加分页拦截器 + interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL)); + return interceptor; + } +} diff --git a/guigu-ssyx-parent/common/service-util/src/main/java/com/atguigu/ssyx/common/config/Swagger2Config.java b/guigu-ssyx-parent/common/service-util/src/main/java/com/atguigu/ssyx/common/config/Swagger2Config.java new file mode 100644 index 0000000..dbbb50f --- /dev/null +++ b/guigu-ssyx-parent/common/service-util/src/main/java/com/atguigu/ssyx/common/config/Swagger2Config.java @@ -0,0 +1,101 @@ +package com.atguigu.ssyx.common.config; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import springfox.documentation.builders.ApiInfoBuilder; +import springfox.documentation.builders.ParameterBuilder; +import springfox.documentation.builders.PathSelectors; +import springfox.documentation.builders.RequestHandlerSelectors; +import springfox.documentation.schema.ModelRef; +import springfox.documentation.service.ApiInfo; +import springfox.documentation.service.Contact; +import springfox.documentation.service.Parameter; +import springfox.documentation.spi.DocumentationType; +import springfox.documentation.spring.web.plugins.Docket; +import springfox.documentation.swagger2.annotations.EnableSwagger2WebMvc; + +import java.util.ArrayList; +import java.util.List; + +/** + * ClassName: Swagger2Config + * Package: com.atguigu.ssyx.common.config + * + * @author yovinchen + * @Create 2023/9/13 13:18 + */ +@Configuration +@EnableSwagger2WebMvc +public class Swagger2Config { + + @Bean + public Docket webApiConfig() { + List pars = new ArrayList<>(); + ParameterBuilder tokenPar = new ParameterBuilder(); + tokenPar + .name("userId") + .description("用户token") + //.defaultValue(JwtHelper.createToken(1L, "admin")) + .defaultValue("1") + .modelRef(new ModelRef("string")) + .parameterType("header") + .required(false) + .build(); + pars.add(tokenPar.build()); + + Docket webApi = new Docket(DocumentationType.SWAGGER_2) + .groupName("webApi") + .apiInfo(webApiInfo()) + .select() + //只显示api路径下的页面 + .apis(RequestHandlerSelectors.basePackage("com.atguigu.ssyx")) + .paths(PathSelectors.regex("/api/.*")) + .build() + .globalOperationParameters(pars); + return webApi; + } + + @Bean + public Docket adminApiConfig() { + List pars = new ArrayList<>(); + ParameterBuilder tokenPar = new ParameterBuilder(); + tokenPar + .name("adminId") + .description("用户token") + .defaultValue("1") + .modelRef(new ModelRef("string")) + .parameterType("header") + .required(false) + .build(); + pars.add(tokenPar.build()); + + Docket adminApi = new Docket(DocumentationType.SWAGGER_2) + .groupName("adminApi") + .apiInfo(adminApiInfo()) + .select() + //只显示admin路径下的页面 + .apis(RequestHandlerSelectors.basePackage("com.atguigu.ssyx")) + .paths(PathSelectors.regex("/admin/.*")) + .build() + .globalOperationParameters(pars); + return adminApi; + } + + private ApiInfo webApiInfo() { + return new ApiInfoBuilder() + .title("网站-API文档") + .description("本文档描述了尚上优选网站微服务接口定义") + .version("1.0") + .contact(new Contact("atguigu", "http://atguigu.com", "atguigu")) + .build(); + } + + private ApiInfo adminApiInfo() { + return new ApiInfoBuilder() + .title("后台管理系统-API文档") + .description("本文档描述了尚上优选后台系统服务接口定义") + .version("1.0") + .contact(new Contact("atguigu", "http://atguigu.com", "atguigu")) + .build(); + } +} diff --git a/guigu-ssyx-parent/common/service-util/src/main/java/com/atguigu/ssyx/common/exception/GlobalExceptionHandler.java b/guigu-ssyx-parent/common/service-util/src/main/java/com/atguigu/ssyx/common/exception/GlobalExceptionHandler.java new file mode 100644 index 0000000..bfd6762 --- /dev/null +++ b/guigu-ssyx-parent/common/service-util/src/main/java/com/atguigu/ssyx/common/exception/GlobalExceptionHandler.java @@ -0,0 +1,38 @@ +package com.atguigu.ssyx.common.exception; + +import com.atguigu.ssyx.common.result.Result; +import org.springframework.web.bind.annotation.ControllerAdvice; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.ResponseBody; + +/** + * ClassName: GlobalExceptionHandler + * Package: com.atguigu.ssyx.common.exception + * 统一异常处理类 + * + * @author yovinchen + * @Create 2023/9/13 13:03 + */ + +@ControllerAdvice +public class GlobalExceptionHandler { + + @ExceptionHandler(Exception.class) + @ResponseBody + public Result error(Exception e) { + e.printStackTrace(); + return Result.fail(null); + } + + /** + * 自定义异常处理方法 + * + * @param e + * @return + */ + @ExceptionHandler(SsyxException.class) + @ResponseBody + public Result error(SsyxException e) { + return Result.build(null, e.getCode(), e.getMessage()); + } +} diff --git a/guigu-ssyx-parent/common/service-util/src/main/java/com/atguigu/ssyx/common/exception/SsyxException.java b/guigu-ssyx-parent/common/service-util/src/main/java/com/atguigu/ssyx/common/exception/SsyxException.java new file mode 100644 index 0000000..fe55aab --- /dev/null +++ b/guigu-ssyx-parent/common/service-util/src/main/java/com/atguigu/ssyx/common/exception/SsyxException.java @@ -0,0 +1,46 @@ +package com.atguigu.ssyx.common.exception; + +import com.atguigu.ssyx.common.result.ResultCodeEnum; +import lombok.Data; + +/** + * ClassName: SsyxException + * Package: com.atguigu.ssyx.common.exception + * 自定义异常类 + * + * @author yovinchen + * @Create 2023/9/13 13:05 + */ + +@Data +public class SsyxException extends RuntimeException { + + //异常状态码 + private Integer code; + + /** + * 通过状态码和错误消息创建异常对象 + * + * @param message + * @param code + */ + public SsyxException(String message, Integer code) { + super(message); + this.code = code; + } + + /** + * 接收枚举类型对象 + * + * @param resultCodeEnum + */ + public SsyxException(ResultCodeEnum resultCodeEnum) { + super(resultCodeEnum.getMessage()); + this.code = resultCodeEnum.getCode(); + } + + @Override + public String toString() { + return "GuliException{" + "code=" + code + ", message=" + this.getMessage() + '}'; + } +} diff --git a/guigu-ssyx-parent/common/service-util/src/main/java/com/atguigu/ssyx/common/result/Result.java b/guigu-ssyx-parent/common/service-util/src/main/java/com/atguigu/ssyx/common/result/Result.java new file mode 100644 index 0000000..255f02c --- /dev/null +++ b/guigu-ssyx-parent/common/service-util/src/main/java/com/atguigu/ssyx/common/result/Result.java @@ -0,0 +1,68 @@ +package com.atguigu.ssyx.common.result; + +import lombok.Data; + +/** + * ClassName: Result + * Package: com.atguigu.ssyx.common.result + * 统一返回结果类 + * + * @author yovinchen + * @Create 2023/9/13 13:01 + */ +@Data +public class Result { + + //状态码 + private Integer code; + //信息 + private String message; + //数据 + private T data; + + //构造私有化 + private Result() { + } + + //设置数据,返回对象的方法 + public static Result build(T data, Integer code, String message) { + //创建Result对象，设置值，返回对象 + Result result = new Result<>(); + //判断返回结果中是否需要数据 + if (data != null) { + //设置数据到result对象 + result.setData(data); + } + //设置其他值 + result.setCode(code); + result.setMessage(message); + //返回设置值之后的对象 + return result; + } + + //设置数据,返回对象的方法 + public static Result build(T data, ResultCodeEnum resultCodeEnum) { + //创建Result对象，设置值，返回对象 + Result result = new Result<>(); + //判断返回结果中是否需要数据 + if (data != null) { + //设置数据到result对象 + result.setData(data); + } + //设置其他值 + result.setCode(resultCodeEnum.getCode()); + result.setMessage(resultCodeEnum.getMessage()); + //返回设置值之后的对象 + return result; + } + + //成功的方法 + public static Result ok(T data) { + return build(data, ResultCodeEnum.SUCCESS); + } + + //失败的方法 + public static Result fail(T data) { + return build(data, ResultCodeEnum.FAIL); + } +} diff --git a/guigu-ssyx-parent/common/service-util/src/main/java/com/atguigu/ssyx/common/result/ResultCodeEnum.java b/guigu-ssyx-parent/common/service-util/src/main/java/com/atguigu/ssyx/common/result/ResultCodeEnum.java new file mode 100644 index 0000000..9d852c8 --- /dev/null +++ b/guigu-ssyx-parent/common/service-util/src/main/java/com/atguigu/ssyx/common/result/ResultCodeEnum.java @@ -0,0 +1,38 @@ +package com.atguigu.ssyx.common.result; + +import lombok.Getter; + +/** + * ClassName: ResultCodeEnum + * Package: com.atguigu.ssyx.common.result + * 统一返回结果状态信息类 + * + * @author yovinchen + * @Create 2023/9/13 12:59 + */ +@Getter +public enum ResultCodeEnum { + + SUCCESS(200, "成功"), FAIL(201, "失败"), SERVICE_ERROR(2012, "服务异常"), DATA_ERROR(204, "数据异常"), ILLEGAL_REQUEST(205, "非法请求"), REPEAT_SUBMIT(206, "重复提交"), + + LOGIN_AUTH(208, "未登陆"), PERMISSION(209, "没有权限"), + + ORDER_PRICE_ERROR(210, "订单商品价格变化"), ORDER_STOCK_FALL(204, "订单库存锁定失败"), CREATE_ORDER_FAIL(210, "创建订单失败"), + + COUPON_GET(220, "优惠券已经领取"), COUPON_LIMIT_GET(221, "优惠券已发放完毕"), + + URL_ENCODE_ERROR(216, "URL编码失败"), ILLEGAL_CALLBACK_REQUEST_ERROR(217, "非法回调请求"), FETCH_ACCESSTOKEN_FAILD(218, "获取accessToken失败"), FETCH_USERINFO_ERROR(219, "获取用户信息失败"), + + + SKU_LIMIT_ERROR(230, "购买个数不能大于限购个数"), REGION_OPEN(240, "该区域已开通"), REGION_NO_OPEN(240, "该区域未开通"), + ; + + private final Integer code; + + private final String message; + + ResultCodeEnum(Integer code, String message) { + this.code = code; + this.message = message; + } +} diff --git a/guigu-ssyx-parent/common/service-util/src/test/java/com/atguigu/ssyx/CodeGet.java b/guigu-ssyx-parent/common/service-util/src/test/java/com/atguigu/ssyx/CodeGet.java new file mode 100644 index 0000000..85d7c86 --- /dev/null +++ b/guigu-ssyx-parent/common/service-util/src/test/java/com/atguigu/ssyx/CodeGet.java @@ -0,0 +1,72 @@ +package com.atguigu.ssyx; + +import com.baomidou.mybatisplus.annotation.DbType; +import com.baomidou.mybatisplus.generator.AutoGenerator; +import com.baomidou.mybatisplus.generator.config.DataSourceConfig; +import com.baomidou.mybatisplus.generator.config.GlobalConfig; +import com.baomidou.mybatisplus.generator.config.PackageConfig; +import com.baomidou.mybatisplus.generator.config.StrategyConfig; +import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy; + +/** + * ClassName: CodeGet + * Package: com.atguigu.ssyx + * + * @author yovinchen + * @Create 2023/9/14 08:49 + */ +public class CodeGet { + + public static void main(String[] args) { + + // 1、创建代码生成器 + AutoGenerator mpg = new AutoGenerator(); + + // 2、全局配置 + // 全局配置 + GlobalConfig gc = new GlobalConfig(); + gc.setOutputDir("guigu-ssyx-parent/service/service-sys" + "/src/main/java"); + + gc.setServiceName("%sService"); //去掉Service接口的首字母I + gc.setAuthor("atguigu"); + gc.setOpen(false); + mpg.setGlobalConfig(gc); + + // 3、数据源配置 + DataSourceConfig dsc = new DataSourceConfig(); + dsc.setUrl("jdbc:mysql://82.157.68.223:3306/shequ-sys?serverTimezone=GMT%2B8&useSSL=false"); + dsc.setDriverName("com.mysql.cj.jdbc.Driver"); + dsc.setUsername("shequ-sys"); + dsc.setPassword("shequ-sys"); + dsc.setDbType(DbType.MYSQL); + mpg.setDataSource(dsc); + + // 4、包配置 + PackageConfig pc = new PackageConfig(); + pc.setParent("com.atguigu.ssyx"); + pc.setModuleName("sys"); //模块名 + pc.setController("controller"); + pc.setService("service"); + pc.setMapper("mapper"); + mpg.setPackageInfo(pc); + + // 5、策略配置 + StrategyConfig strategy = new StrategyConfig(); + + strategy.setInclude("region", "ware", "region_ware"); + + strategy.setNaming(NamingStrategy.underline_to_camel);//数据库表映射到实体的命名策略 + + strategy.setColumnNaming(NamingStrategy.underline_to_camel);//数据库表字段映射到实体的命名策略 + strategy.setEntityLombokModel(true); // lombok 模型 @Accessors(chain = true) setter链式操作 + + strategy.setRestControllerStyle(true); //restful api风格控制器 + strategy.setControllerMappingHyphenStyle(true); //url中驼峰转连字符 + + mpg.setStrategy(strategy); + + // 6、执行 + mpg.execute(); + } +} + diff --git a/guigu-ssyx-parent/model/pom.xml b/guigu-ssyx-parent/model/pom.xml new file mode 100644 index 0000000..49a7b3c --- /dev/null +++ b/guigu-ssyx-parent/model/pom.xml @@ -0,0 +1,64 @@ + + + 4.0.0 + + com.atguigu + guigu-ssyx-parent + 1.0-SNAPSHOT + + + model + + + + org.projectlombok + lombok + + + + + com.baomidou + mybatis-plus-boot-starter + provided + + + + com.github.xiaoymin + knife4j-spring-boot-starter + + provided + + + + org.springframework.boot + spring-boot-starter-data-mongodb + provided + + + + com.alibaba + fastjson + provided + + + + + org.springframework.boot + spring-boot-starter-data-elasticsearch + provided + + + com.alibaba + fastjson + 1.2.76 + + + + 8 + 8 + UTF-8 + + + diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/enums/ActivityType.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/enums/ActivityType.java new file mode 100644 index 0000000..d107dce --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/enums/ActivityType.java @@ -0,0 +1,19 @@ +package com.atguigu.ssyx.enums; + +import com.baomidou.mybatisplus.annotation.EnumValue; +import lombok.Getter; + +@Getter +public enum ActivityType { + FULL_REDUCTION(1, "满减"), + FULL_DISCOUNT(2, "满量打折"); + + @EnumValue + private Integer code; + private String comment; + + ActivityType(Integer code, String comment) { + this.code = code; + this.comment = comment; + } +} diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/enums/BillType.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/enums/BillType.java new file mode 100644 index 0000000..2b30e69 --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/enums/BillType.java @@ -0,0 +1,24 @@ +package com.atguigu.ssyx.enums; + +import com.alibaba.fastjson.annotation.JSONType; +import com.alibaba.fastjson.parser.deserializer.EnumDeserializer; +import com.alibaba.fastjson.serializer.EnumSerializer; +import com.baomidou.mybatisplus.annotation.EnumValue; +import lombok.Getter; + +@JSONType(serializer = EnumSerializer.class, deserializer = EnumDeserializer.class, serializeEnumAsJavaBean = true) +@Getter +public enum BillType { + ORDER(0, "订单佣金"), + WITHDRAW(1, "提现"), + REFUND(1, "订单退款"); + + @EnumValue + private final Integer code; + private final String comment; + + BillType(Integer code, String comment) { + this.code = code; + this.comment = comment; + } +} diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/enums/CouponRangeType.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/enums/CouponRangeType.java new file mode 100644 index 0000000..aaeb844 --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/enums/CouponRangeType.java @@ -0,0 +1,21 @@ +package com.atguigu.ssyx.enums; + +import com.baomidou.mybatisplus.annotation.EnumValue; +import lombok.Getter; + +@Getter +public enum CouponRangeType { + ALL(1, "通用"), + SKU(2, "SKU"), + CATEGORY(3, "分类"); + + @EnumValue + private Integer code; + private String comment; + + CouponRangeType(Integer code, String comment) { + this.code = code; + this.comment = comment; + } + +} diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/enums/CouponStatus.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/enums/CouponStatus.java new file mode 100644 index 0000000..158d46b --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/enums/CouponStatus.java @@ -0,0 +1,19 @@ +package com.atguigu.ssyx.enums; + +import com.baomidou.mybatisplus.annotation.EnumValue; +import lombok.Getter; + +@Getter +public enum CouponStatus { + NOT_USED(1, "未使用"), + USED(2, "已使用"); + + @EnumValue + private Integer code; + private String comment; + + CouponStatus(Integer code, String comment) { + this.code = code; + this.comment = comment; + } +} diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/enums/CouponType.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/enums/CouponType.java new file mode 100644 index 0000000..c24800f --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/enums/CouponType.java @@ -0,0 +1,19 @@ +package com.atguigu.ssyx.enums; + +import com.baomidou.mybatisplus.annotation.EnumValue; +import lombok.Getter; + +@Getter +public enum CouponType { + FULL_REDUCTION(1, "满减"), + CASH(2, "现金卷"); + + @EnumValue + private Integer code; + private String comment; + + CouponType(Integer code, String comment) { + this.code = code; + this.comment = comment; + } +} diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/enums/OrderStatus.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/enums/OrderStatus.java new file mode 100644 index 0000000..65c184a --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/enums/OrderStatus.java @@ -0,0 +1,24 @@ +package com.atguigu.ssyx.enums; + +import com.baomidou.mybatisplus.annotation.EnumValue; +import lombok.Getter; + +@Getter +public enum OrderStatus { + //订单状态【0->待付款；1->待发货；2->待团长收货；3->待用户收货，已完成；-1->已取消】 + UNPAID(0, "待支付"), + WAITING_DELEVER(1, "待发货"), + WAITING_TAKE(2, "待提货"), + WAITING_COMMON(3, "待评论"), + FINISHED(4, "已完结"), + CANCEL(-1, "已取消"); + + @EnumValue + private Integer code; + private String comment; + + OrderStatus(Integer code, String comment) { + this.code = code; + this.comment = comment; + } +} diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/enums/PaymentStatus.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/enums/PaymentStatus.java new file mode 100644 index 0000000..fe9b387 --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/enums/PaymentStatus.java @@ -0,0 +1,21 @@ +package com.atguigu.ssyx.enums; + +import com.baomidou.mybatisplus.annotation.EnumValue; +import lombok.Getter; + +@Getter +public enum PaymentStatus { + UNPAID(1, "支付中"), + PAID(2, "已支付"); + //REFUND(-1,"已退款"); + + @EnumValue + private Integer code; + private String comment; + + PaymentStatus(Integer code, String comment) { + this.code = code; + this.comment = comment; + } + +} diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/enums/PaymentType.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/enums/PaymentType.java new file mode 100644 index 0000000..3a6d034 --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/enums/PaymentType.java @@ -0,0 +1,20 @@ +package com.atguigu.ssyx.enums; + +import com.baomidou.mybatisplus.annotation.EnumValue; +import lombok.Getter; + +@Getter +public enum PaymentType { + ALIPAY(1, "支付宝"), + WEIXIN(2, "微信"); + + @EnumValue + private Integer code; + private String comment; + + PaymentType(Integer code, String comment) { + this.code = code; + this.comment = comment; + } + +} diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/enums/ProcessStatus.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/enums/ProcessStatus.java new file mode 100644 index 0000000..0badd90 --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/enums/ProcessStatus.java @@ -0,0 +1,26 @@ +package com.atguigu.ssyx.enums; + +import com.baomidou.mybatisplus.annotation.EnumValue; +import lombok.Getter; + +@Getter +public enum ProcessStatus { + UNPAID(1, OrderStatus.UNPAID), + WAITING_DELEVER(2, OrderStatus.WAITING_DELEVER), + WAITING_LEADER_TAKE(3, OrderStatus.WAITING_TAKE), + WAITING_USER_TAKE(4, OrderStatus.WAITING_TAKE), + WAITING_COMMON(5, OrderStatus.WAITING_COMMON), + FINISHED(6, OrderStatus.FINISHED), + CANCEL(-1, OrderStatus.CANCEL), + PAY_FAIL(-2, OrderStatus.UNPAID); + + @EnumValue + private Integer code; + private OrderStatus orderStatus; + + ProcessStatus(Integer code, OrderStatus orderStatus) { + this.code = code; + this.orderStatus = orderStatus; + } + +} diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/enums/SkuType.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/enums/SkuType.java new file mode 100644 index 0000000..4706589 --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/enums/SkuType.java @@ -0,0 +1,19 @@ +package com.atguigu.ssyx.enums; + +import com.baomidou.mybatisplus.annotation.EnumValue; +import lombok.Getter; + +@Getter +public enum SkuType { + COMMON(0, "普通"), + SECKILL(1, "秒杀"); + + @EnumValue + private Integer code; + private String comment; + + SkuType(Integer code, String comment) { + this.code = code; + this.comment = comment; + } +} diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/enums/UserType.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/enums/UserType.java new file mode 100644 index 0000000..42bf213 --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/enums/UserType.java @@ -0,0 +1,23 @@ +package com.atguigu.ssyx.enums; + +import com.alibaba.fastjson.annotation.JSONType; +import com.alibaba.fastjson.parser.deserializer.EnumDeserializer; +import com.alibaba.fastjson.serializer.EnumSerializer; +import com.baomidou.mybatisplus.annotation.EnumValue; +import lombok.Getter; + +@JSONType(serializer = EnumSerializer.class, deserializer = EnumDeserializer.class, serializeEnumAsJavaBean = true) +@Getter +public enum UserType { + USER(0, "会员"), + LEADER(1, "团长"); + + @EnumValue + private Integer code; + private String comment; + + UserType(Integer code, String comment) { + this.code = code; + this.comment = comment; + } +} diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/acl/Admin.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/acl/Admin.java new file mode 100644 index 0000000..376d571 --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/acl/Admin.java @@ -0,0 +1,51 @@ +package com.atguigu.ssyx.model.acl; + +import com.atguigu.ssyx.model.base.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + *

+ * 用户 + *

+ * + * @author qy + * @since 2019-11-08 + */ +@Data +@ApiModel(description = "用户") +@TableName("admin") +public class Admin extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "用户名") + @TableField("username") + private String username; + + @ApiModelProperty(value = "密码") + @TableField("password") + private String password; + + @ApiModelProperty(value = "昵称") + @TableField("name") + private String name; + + @ApiModelProperty(value = "手机") + @TableField("phone") + private String phone; + + @ApiModelProperty(value = "仓库id") + @TableField("ware_id") + private Long wareId; + + @ApiModelProperty(value = "角色名称") + @TableField(exist = false) + private String roleName; +} + + + diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/acl/AdminRole.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/acl/AdminRole.java new file mode 100644 index 0000000..a34d206 --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/acl/AdminRole.java @@ -0,0 +1,34 @@ +package com.atguigu.ssyx.model.acl; + +import com.atguigu.ssyx.model.base.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + *

+ * 用户角色 + *

+ * + * @author qy + * @since 2019-11-08 + */ +@Data +@ApiModel(description = "用户角色") +@TableName("admin_role") +public class AdminRole extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "角色id") + @TableField("role_id") + private Long roleId; + + @ApiModelProperty(value = "用户id") + @TableField("admin_id") + private Long adminId; + +} + diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/acl/Permission.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/acl/Permission.java new file mode 100644 index 0000000..16de348 --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/acl/Permission.java @@ -0,0 +1,66 @@ +// +// +package com.atguigu.ssyx.model.acl; + +import com.atguigu.ssyx.model.base.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + *

+ * 权限 + *

+ * + * @author qy + * @since 2019-11-08 + */ +@Data +@ApiModel(description = "权限") +@TableName("permission") +public class Permission extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "所属上级") + @TableField("pid") + private Long pid; + + @ApiModelProperty(value = "名称") + @TableField("name") + private String name; + + @ApiModelProperty(value = "名称编码") + @TableField("code") + private String code; + + @ApiModelProperty(value = "跳转页面code") + @TableField("to_code") + private String toCode; + + @ApiModelProperty(value = "类型(1:菜单,2:按钮)") + @TableField("type") + private Integer type; + + @ApiModelProperty(value = "状态(0:禁止,1:正常)") + @TableField("status") + private Integer status; + + @ApiModelProperty(value = "层级") + @TableField(exist = false) + private Integer level; + + @ApiModelProperty(value = "下级") + @TableField(exist = false) + private List children; + + @ApiModelProperty(value = "是否选中") + @TableField(exist = false) + private boolean isSelect; + +} + diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/acl/Role.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/acl/Role.java new file mode 100644 index 0000000..aab45fd --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/acl/Role.java @@ -0,0 +1,36 @@ +// +// +package com.atguigu.ssyx.model.acl; + +import com.atguigu.ssyx.model.base.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + *

+ * 角色 + *

+ * + * @author qy + * @since 2019-11-08 + */ +@Data +@ApiModel(description = "角色") +@TableName("role") +public class Role extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "角色名称") + @TableField("role_name") + private String roleName; + + @ApiModelProperty(value = "备注") + @TableField("remark") + private String remark; + +} + diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/acl/RolePermission.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/acl/RolePermission.java new file mode 100644 index 0000000..8a9342b --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/acl/RolePermission.java @@ -0,0 +1,36 @@ +// +// +package com.atguigu.ssyx.model.acl; + +import com.atguigu.ssyx.model.base.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + *

+ * 角色权限 + *

+ * + * @author qy + * @since 2019-11-08 + */ +@Data +@ApiModel(description = "角色权限") +@TableName("role_permission") +public class RolePermission extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "roleid") + @TableField("role_id") + private Long roleId; + + @ApiModelProperty(value = "permissionId") + @TableField("permission_id") + private Long permissionId; + +} + diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/activity/ActivityInfo.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/activity/ActivityInfo.java new file mode 100644 index 0000000..38918ef --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/activity/ActivityInfo.java @@ -0,0 +1,58 @@ +package com.atguigu.ssyx.model.activity; + +import com.atguigu.ssyx.enums.ActivityType; +import com.atguigu.ssyx.model.base.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + *

+ * ActivityInfo + *

+ * + * @author qy + */ +@Data +@ApiModel(description = "ActivityInfo") +@TableName("activity_info") +public class ActivityInfo extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "活动名称") + @TableField("activity_name") + private String activityName; + + @ApiModelProperty(value = "活动类型（满减、折扣）") + @TableField("activity_type") + private ActivityType activityType; + + @ApiModelProperty(value = "活动描述") + @TableField("activity_desc") + private String activityDesc; + + @ApiModelProperty(value = "开始时间") + @TableField("start_time") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date startTime; + + @ApiModelProperty(value = "结束时间") + @TableField("end_time") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date endTime; + + @ApiModelProperty(value = "创建时间") + @TableField("create_time") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTime; + + @TableField(exist = false) + private String activityTypeString; +} + diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/activity/ActivityRule.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/activity/ActivityRule.java new file mode 100644 index 0000000..17a03b0 --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/activity/ActivityRule.java @@ -0,0 +1,68 @@ +package com.atguigu.ssyx.model.activity; + +import com.atguigu.ssyx.enums.ActivityType; +import com.atguigu.ssyx.model.base.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +/** + *

+ * ActivityRule + *

+ * + * @author qy + */ +@Data +@ApiModel(description = "ActivityRule") +@TableName("activity_rule") +public class ActivityRule extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "类型") + @TableField("activity_id") + private Long activityId; + + @ApiModelProperty(value = "活动类型（满减、折扣）") + @TableField("activity_type") + private ActivityType activityType; + + @ApiModelProperty(value = "满减金额") + @TableField("condition_amount") + private BigDecimal conditionAmount; + + @ApiModelProperty(value = "满减件数") + @TableField("condition_num") + private Long conditionNum; + + @ApiModelProperty(value = "优惠金额") + @TableField("benefit_amount") + private BigDecimal benefitAmount; + + @ApiModelProperty(value = "优惠折扣") + @TableField("benefit_discount") + private BigDecimal benefitDiscount; + + @ApiModelProperty(value = "活动skuId") + @TableField(exist = false) + private Long skuId; + + @ApiModelProperty(value = "优惠后减少金额") + @TableField(exist = false) + private BigDecimal reduceAmount; + + @ApiModelProperty(value = "选中类型：1：去凑单 2：逛一逛") + @TableField(exist = false) + private Integer selectType; + + @ApiModelProperty(value = "规则优惠描述") + @TableField(exist = false) + private String ruleDesc; + +} + diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/activity/ActivitySku.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/activity/ActivitySku.java new file mode 100644 index 0000000..3eb42b8 --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/activity/ActivitySku.java @@ -0,0 +1,36 @@ +package com.atguigu.ssyx.model.activity; + +import com.atguigu.ssyx.model.base.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + *

+ * ActivitySku + *

+ * + * @author qy + */ +@Data +@ApiModel(description = "ActivitySku") +@TableName("activity_sku") +public class ActivitySku extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "活动id ") + @TableField("activity_id") + private Long activityId; + + @ApiModelProperty(value = "sku_id") + @TableField("sku_id") + private Long skuId; + +// @TableField(exist = false) +// private SkuInfo skuInfo; + +} + diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/activity/CouponInfo.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/activity/CouponInfo.java new file mode 100644 index 0000000..5ca79d1 --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/activity/CouponInfo.java @@ -0,0 +1,102 @@ +package com.atguigu.ssyx.model.activity; + +import com.atguigu.ssyx.enums.CouponRangeType; +import com.atguigu.ssyx.enums.CouponType; +import com.atguigu.ssyx.model.base.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; +import java.util.List; + +@Data +@ApiModel(description = "CouponInfo") +@TableName("coupon_info") +public class CouponInfo extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "购物券类型 1 现金券 2 满减券") + @TableField("coupon_type") + private CouponType couponType; + + @ApiModelProperty(value = "优惠卷名字") + @TableField("coupon_name") + private String couponName; + + @ApiModelProperty(value = "金额") + @TableField("amount") + private BigDecimal amount; + + @ApiModelProperty(value = "使用门槛 0->没门槛") + @TableField("condition_amount") + private BigDecimal conditionAmount; + + @ApiModelProperty(value = "可以领取的开始日期") + @JsonFormat(pattern = "yyyy-MM-dd") + @TableField("start_time") + private Date startTime; + + @ApiModelProperty(value = "可以领取的结束日期") + @JsonFormat(pattern = "yyyy-MM-dd") + @TableField("end_time") + private Date endTime; + + @ApiModelProperty(value = "使用范围[0->全场通用；1->指定分类；2->指定商品]") + @TableField("range_type") + private CouponRangeType rangeType; + + @ApiModelProperty(value = "使用范围描述") + @TableField("range_desc") + private String rangeDesc; + + @ApiModelProperty(value = "发行数量") + @TableField("publish_count") + private Integer publishCount; + + @ApiModelProperty(value = "每人限领张数") + @TableField("per_limit") + private Integer perLimit; + + @ApiModelProperty(value = "已使用数量") + @TableField("use_count") + private Integer useCount; + + @ApiModelProperty(value = "领取数量") + @TableField("receive_count") + private Integer receiveCount; + + @ApiModelProperty(value = "过期时间") + @TableField("expire_time") + private Date expireTime; + + @ApiModelProperty(value = "发布状态[0-未发布，1-已发布]") + @TableField("publish_status") + private Boolean publishStatus; + + @TableField(exist = false) + private String couponTypeString; + @TableField(exist = false) + private String rangeTypeString; + + @ApiModelProperty(value = "使用状态") + @TableField(exist = false) + private Integer couponStatus; + + @ApiModelProperty(value = "是否可选") + @TableField(exist = false) + private Integer isSelect = 0; + + @ApiModelProperty(value = "是否最优选项") + @TableField(exist = false) + private Integer isOptimal = 0; + + @ApiModelProperty(value = "优惠券对应的skuId列表，提交订单使用") + @TableField(exist = false) + private List skuIdList; +} diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/activity/CouponRange.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/activity/CouponRange.java new file mode 100644 index 0000000..39dd1ed --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/activity/CouponRange.java @@ -0,0 +1,38 @@ +package com.atguigu.ssyx.model.activity; + +import com.atguigu.ssyx.enums.CouponRangeType; +import com.atguigu.ssyx.model.base.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + *

+ * CouponRange + *

+ * + * @author qy + */ +@Data +@ApiModel(description = "CouponRange") +@TableName("coupon_range") +public class CouponRange extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "优惠券id") + @TableField("coupon_id") + private Long couponId; + + @ApiModelProperty(value = "范围类型 1、商品(spuid) 2、品类(三级分类id) 3、品牌") + @TableField("range_type") + private CouponRangeType rangeType; + + @ApiModelProperty(value = "rangeId") + @TableField("range_id") + private Long rangeId; + +} + diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/activity/CouponUse.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/activity/CouponUse.java new file mode 100644 index 0000000..04d47f1 --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/activity/CouponUse.java @@ -0,0 +1,60 @@ +package com.atguigu.ssyx.model.activity; + +import com.atguigu.ssyx.enums.CouponStatus; +import com.atguigu.ssyx.model.base.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + *

+ * CouponUse + *

+ * + * @author qy + */ +@Data +@ApiModel(description = "优惠券领取记录表") +@TableName("coupon_use") +public class CouponUse extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "购物券ID") + @TableField("coupon_id") + private Long couponId; + + @ApiModelProperty(value = "用户ID") + @TableField("user_id") + private Long userId; + + @ApiModelProperty(value = "订单ID") + @TableField("order_id") + private Long orderId; + + @ApiModelProperty(value = "购物券状态") + @TableField("coupon_status") + private CouponStatus couponStatus; + + @ApiModelProperty(value = "领券时间") + @TableField("get_time") + private Date getTime; + + @ApiModelProperty(value = "使用时间") + @TableField("using_time") + private Date usingTime; + + @ApiModelProperty(value = "支付时间") + @TableField("used_time") + private Date usedTime; + + @ApiModelProperty(value = "过期时间") + @TableField("expire_time") + private Date expireTime; + +} + diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/activity/Seckill.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/activity/Seckill.java new file mode 100644 index 0000000..31cb474 --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/activity/Seckill.java @@ -0,0 +1,38 @@ +package com.atguigu.ssyx.model.activity; + +import com.atguigu.ssyx.model.base.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +@Data +@ApiModel(description = "Seckill") +@TableName("seckill") +public class Seckill extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "活动标题") + @TableField("title") + private String title; + + @ApiModelProperty(value = "开始时间") + @JsonFormat(pattern = "yyyy-MM-dd") + @TableField("start_time") + private Date startTime; + + @ApiModelProperty(value = "结束时间") + @JsonFormat(pattern = "yyyy-MM-dd") + @TableField("end_time") + private Date endTime; + + @ApiModelProperty(value = "上下线状态") + @TableField("status") + private Integer status; + +} diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/activity/SeckillSku.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/activity/SeckillSku.java new file mode 100644 index 0000000..03ff572 --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/activity/SeckillSku.java @@ -0,0 +1,64 @@ +package com.atguigu.ssyx.model.activity; + +import com.atguigu.ssyx.model.base.BaseEntity; +import com.atguigu.ssyx.model.product.SkuInfo; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +@Data +@ApiModel(description = "SeckillSku") +@TableName("seckill_sku") +public class SeckillSku extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "秒杀活动id") + @TableField("seckill_id") + private Long seckillId; + + @ApiModelProperty(value = "活动场次id") + @TableField("seckill_time_id") + private Long seckillTimeId; + + @ApiModelProperty(value = "商品id") + @TableField("sku_id") + private Long skuId; + + @ApiModelProperty(value = "spu名称") + @TableField("sku_name") + private String skuName; + + @ApiModelProperty(value = "展示图片") + @TableField("img_url") + private String imgUrl; + + @ApiModelProperty(value = "秒杀价格") + @TableField("seckill_price") + private BigDecimal seckillPrice; + + @ApiModelProperty(value = "秒杀总量") + @TableField("seckill_stock") + private Integer seckillStock; + + @ApiModelProperty(value = "每人限购数量") + @TableField("seckill_limit") + private Integer seckillLimit; + + @ApiModelProperty(value = "秒杀销量") + @TableField("seckill_sale") + private Integer seckillSale; + + @ApiModelProperty(value = "排序") + @TableField("seckill_sort") + private Integer seckillSort; + + @ApiModelProperty(value = "sku信息") + @TableField(exist = false) + private SkuInfo skuInfo; + +} diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/activity/SeckillSkuNotice.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/activity/SeckillSkuNotice.java new file mode 100644 index 0000000..9c4d067 --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/activity/SeckillSkuNotice.java @@ -0,0 +1,43 @@ +package com.atguigu.ssyx.model.activity; + +import com.atguigu.ssyx.model.base.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +@Data +@ApiModel(description = "SeckillSkuNotice") +@TableName("seckill_sku_notice") +public class SeckillSkuNotice extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "user_id") + @TableField("user_id") + private Long userId; + + @ApiModelProperty(value = "sku_id") + @TableField("sku_id") + private Long skuId; + + @ApiModelProperty(value = "活动场次id") + @TableField("session_id") + private Long sessionId; + + @ApiModelProperty(value = "订阅时间") + @TableField("subcribe_time") + private Date subcribeTime; + + @ApiModelProperty(value = "发送时间") + @TableField("send_time") + private Date sendTime; + + @ApiModelProperty(value = "通知方式[0-短信，1-邮件]") + @TableField("notice_type") + private Boolean noticeType; + +} diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/activity/SeckillTime.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/activity/SeckillTime.java new file mode 100644 index 0000000..166fa93 --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/activity/SeckillTime.java @@ -0,0 +1,41 @@ +package com.atguigu.ssyx.model.activity; + +import com.atguigu.ssyx.model.base.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +@Data +@ApiModel(description = "SeckillTime") +@TableName("seckill_time") +public class SeckillTime extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "场次名称") + @TableField("name") + private String name; + + @ApiModelProperty(value = "每日开始时间") + @JsonFormat(pattern = "HH:mm:ss") + @TableField("start_time") + private Date startTime; + + @ApiModelProperty(value = "每日结束时间") + @JsonFormat(pattern = "HH:mm:ss") + private Date endTime; + + @ApiModelProperty(value = "启用状态") + @TableField("status") + private Integer status; + + @ApiModelProperty(value = "场次状态 1：已开抢 2：抢购中 3：即将开抢") + @TableField(exist = false) + private Integer timeStaus; + +} diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/base/BaseEntity.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/base/BaseEntity.java new file mode 100644 index 0000000..25ab6f2 --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/base/BaseEntity.java @@ -0,0 +1,43 @@ +package com.atguigu.ssyx.model.base; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonIgnore; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; + +@Data +public class BaseEntity implements Serializable { + + @ApiModelProperty(value = "id") + @TableId(type = IdType.AUTO) + private Long id; + + @ApiModelProperty(value = "创建时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @TableField("create_time") + private Date createTime; + + @ApiModelProperty(value = "更新时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @TableField("update_time") + private Date updateTime; + + @ApiModelProperty(value = "逻辑删除(1:已删除，0:未删除)") + @JsonIgnore + @TableLogic + @TableField("is_deleted") + private Integer isDeleted; + + @ApiModelProperty(value = "其他参数") + @TableField(exist = false) + private Map param = new HashMap<>(); +} diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/base/BaseMongoEntity.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/base/BaseMongoEntity.java new file mode 100644 index 0000000..c039edd --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/base/BaseMongoEntity.java @@ -0,0 +1,39 @@ +package com.atguigu.ssyx.model.base; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import io.swagger.annotations.ApiModelProperty; +import org.bson.types.ObjectId; +import org.springframework.data.annotation.CreatedDate; +import org.springframework.data.annotation.Id; +import lombok.Data; +import org.springframework.data.annotation.LastModifiedDate; +import org.springframework.data.annotation.Transient; +import org.springframework.data.mongodb.core.index.Indexed; + +import java.io.Serializable; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; + +@Data +public class BaseMongoEntity implements Serializable { + + @ApiModelProperty(value = "id") + @Id + private String id; + + @ApiModelProperty(value = "创建时间") + @CreatedDate + private Date createTime; + + @ApiModelProperty(value = "更新时间") + @LastModifiedDate + private Date updateTime; + + @ApiModelProperty(value = "其他参数") + @Transient //被该注解标注的，将不会被录入到数据库中。只作为普通的javaBean属性 + private Map param = new HashMap<>(); +} diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/base/MqRepeatRecord.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/base/MqRepeatRecord.java new file mode 100644 index 0000000..4b6db45 --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/base/MqRepeatRecord.java @@ -0,0 +1,20 @@ +package com.atguigu.ssyx.model.base; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel(description = "MqRepeatRecord") +@TableName("mq_repeat_record") +public class MqRepeatRecord extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "业务编号") + @TableField("business_no") + private String businessNo; + +} diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/order/CartInfo.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/order/CartInfo.java new file mode 100644 index 0000000..414b831 --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/order/CartInfo.java @@ -0,0 +1,68 @@ +package com.atguigu.ssyx.model.order; + +import com.atguigu.ssyx.model.base.BaseEntity; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +@Data +@ApiModel(description = "CartInfo") +public class CartInfo extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "用户id") + private Long userId; + + @ApiModelProperty(value = "分类id") + private Long categoryId; + + @ApiModelProperty(value = "商品类型：0->普通商品 1->秒杀商品") + private Integer skuType; + + @ApiModelProperty(value = "是否新人专享：0->否；1->是") + private Integer isNewPerson; + + @ApiModelProperty(value = "sku名称 (冗余)") + private String skuName; + + @ApiModelProperty(value = "skuid") + private Long skuId; + + @ApiModelProperty(value = "放入购物车时价格") + private BigDecimal cartPrice; + + @ApiModelProperty(value = "数量") + private Integer skuNum; + + @ApiModelProperty(value = "限购个数") + private Integer perLimit; + + @ApiModelProperty(value = "图片文件") + private String imgUrl; + + @ApiModelProperty(value = "isChecked") + private Integer isChecked; + + @ApiModelProperty(value = "状态") + private Integer status; + + @ApiModelProperty(value = "秒杀开始时间") + @JsonFormat(pattern = "HH:mm:ss") + private Date startTime; + + @ApiModelProperty(value = "秒杀结束时间") + @JsonFormat(pattern = "HH:mm:ss") + private Date endTime; + + @ApiModelProperty(value = "仓库") + private Long wareId; + + @ApiModelProperty(value = "当天已购买个数") + private Integer currentBuyNum = 0; + +} diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/order/OrderDeliver.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/order/OrderDeliver.java new file mode 100644 index 0000000..30998ff --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/order/OrderDeliver.java @@ -0,0 +1,43 @@ +package com.atguigu.ssyx.model.order; + +import com.atguigu.ssyx.model.base.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +@Data +@ApiModel(description = "OrderDeliver") +@TableName("order_deliver") +public class OrderDeliver extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "配送日期") + @TableField("deliver_date") + private Date deliverDate; + + @ApiModelProperty(value = "团长id") + @TableField("leader_id") + private Long leaderId; + + @ApiModelProperty(value = "司机id") + @TableField("driver_id") + private Long driverId; + + @ApiModelProperty(value = "司机名称") + @TableField("driver_name") + private String driverName; + + @ApiModelProperty(value = "司机电话") + @TableField("driver_phone") + private String driverPhone; + + @ApiModelProperty(value = "状态（0：默认，1：已发货，2：团长收货）") + @TableField("status") + private Integer status; + +} diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/order/OrderInfo.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/order/OrderInfo.java new file mode 100644 index 0000000..9e4546c --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/order/OrderInfo.java @@ -0,0 +1,173 @@ +package com.atguigu.ssyx.model.order; + +import com.atguigu.ssyx.enums.OrderStatus; +import com.atguigu.ssyx.enums.ProcessStatus; +import com.atguigu.ssyx.model.base.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; +import java.util.List; + +@Data +@ApiModel(description = "OrderInfo") +@TableName("order_info") +public class OrderInfo extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "会员_id") + @TableField("user_id") + private Long userId; + + @ApiModelProperty(value = "昵称") + @TableField("nick_name") + private String nickName; + + @ApiModelProperty(value = "订单号") + @TableField("order_no") + private String orderNo; + + @ApiModelProperty(value = "使用的优惠券") + @TableField("coupon_id") + private Long couponId; + + @ApiModelProperty(value = "订单总额") + @TableField("total_amount") + private BigDecimal totalAmount; + + @ApiModelProperty(value = "促销活动金额") + @TableField("activity_amount") + private BigDecimal activityAmount; + + @ApiModelProperty(value = "优惠券") + @TableField("coupon_amount") + private BigDecimal couponAmount; + + @ApiModelProperty(value = "原价金额") + @TableField("original_total_amount") + private BigDecimal originalTotalAmount; + + @ApiModelProperty(value = "运费") + @TableField("feight_fee") + private BigDecimal feightFee; + + @ApiModelProperty(value = "减免运费") + @TableField("feight_fee_reduce") + private BigDecimal feightFeeReduce; + + @ApiModelProperty(value = "可退款日期（签收后1天）") + @TableField("refundable_time") + private Date refundableTime; + + @ApiModelProperty(value = "支付方式【1->微信】") + @TableField("pay_type") + private Integer payType; + + @ApiModelProperty(value = "订单来源[0->小程序；1->H5]") + @TableField("source_type") + private Integer sourceType; + + @ApiModelProperty(value = "订单状态【0->待付款；1->待发货；2->待团长收货；3->待用户收货，已完成；-1->已取消】") + @TableField("order_status") + private OrderStatus orderStatus; + + @ApiModelProperty(value = "进度状态") + @TableField("process_status") + private ProcessStatus processStatus; + + @ApiModelProperty(value = "团长id") + @TableField("leader_id") + private Long leaderId; + + @ApiModelProperty(value = "团长名称") + @TableField("leader_name") + private String leaderName; + + @ApiModelProperty(value = "团长手机") + @TableField("leader_phone") + private String leaderPhone; + + @ApiModelProperty(value = "提货点名称") + @TableField("take_name") + private String takeName; + + @ApiModelProperty(value = "收货人姓名") + @TableField("receiver_name") + private String receiverName; + + @ApiModelProperty(value = "收货人电话") + @TableField("receiver_phone") + private String receiverPhone; + + @ApiModelProperty(value = "收货人邮编") + @TableField("receiver_post_code") + private String receiverPostCode; + + @ApiModelProperty(value = "省份/直辖市") + @TableField("receiver_province") + private String receiverProvince; + + @ApiModelProperty(value = "城市") + @TableField("receiver_city") + private String receiverCity; + + @ApiModelProperty(value = "区") + @TableField("receiver_district") + private String receiverDistrict; + + @ApiModelProperty(value = "详细地址") + @TableField("receiver_address") + private String receiverAddress; + + @ApiModelProperty(value = "支付时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @TableField("payment_time") + private Date paymentTime; + + @ApiModelProperty(value = "发货时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @TableField("delivery_time") + private Date deliveryTime; + + @ApiModelProperty(value = "提货时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @TableField("take_time") + private Date takeTime; + + @ApiModelProperty(value = "确认收货时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @TableField("receive_time") + private Date receiveTime; + + @ApiModelProperty(value = "订单备注") + @TableField("remark") + private String remark; + + @ApiModelProperty(value = "取消订单时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @TableField("cancel_time") + private Date cancelTime; + + @ApiModelProperty(value = "取消订单原因") + @TableField("cancel_reason") + private String cancelReason; + + @ApiModelProperty(value = "仓库id") + @TableField("ware_id") + private Long wareId; + + @ApiModelProperty(value = "团长佣金") + @TableField("commission_amount") + private BigDecimal commissionAmount; + + @ApiModelProperty(value = "订单项列表") + @TableField(exist = false) + private List orderItemList; + +} diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/order/OrderItem.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/order/OrderItem.java new file mode 100644 index 0000000..52bdd22 --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/order/OrderItem.java @@ -0,0 +1,68 @@ +package com.atguigu.ssyx.model.order; + +import com.atguigu.ssyx.enums.SkuType; +import com.atguigu.ssyx.model.base.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +@Data +@ApiModel(description = "OrderItem") +@TableName("order_item") +public class OrderItem extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "order_id") + @TableField("order_id") + private Long orderId; + + @ApiModelProperty(value = "商品分类id") + @TableField("category_id") + private Long categoryId; + + @ApiModelProperty(value = "商品类型：0->普通商品 1->秒杀商品") + @TableField("sku_type") + private SkuType skuType; + + @ApiModelProperty(value = "商品sku编号") + @TableField("sku_id") + private Long skuId; + + @ApiModelProperty(value = "商品sku名字") + @TableField("sku_name") + private String skuName; + + @ApiModelProperty(value = "商品sku图片") + @TableField("img_url") + private String imgUrl; + + @ApiModelProperty(value = "商品sku价格") + @TableField("sku_price") + private BigDecimal skuPrice; + + @ApiModelProperty(value = "商品购买的数量") + @TableField("sku_num") + private Integer skuNum; + + @ApiModelProperty(value = "商品促销活动分解金额") + @TableField("split_activity_amount") + private BigDecimal splitActivityAmount; + + @ApiModelProperty(value = "优惠券优惠分解金额") + @TableField("split_coupon_amount") + private BigDecimal splitCouponAmount; + + @ApiModelProperty(value = "该商品经过优惠后的分解金额") + @TableField("split_total_amount") + private BigDecimal splitTotalAmount; + + @ApiModelProperty(value = "团长id（冗余）") + @TableField("leader_id") + private Long leaderId; + +} diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/order/OrderLog.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/order/OrderLog.java new file mode 100644 index 0000000..7981c42 --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/order/OrderLog.java @@ -0,0 +1,34 @@ +package com.atguigu.ssyx.model.order; + +import com.atguigu.ssyx.enums.ProcessStatus; +import com.atguigu.ssyx.model.base.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel(description = "OrderLog") +@TableName("order_log") +public class OrderLog extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "订单id") + @TableField("order_id") + private Long orderId; + + @ApiModelProperty(value = "操作人：用户；系统；后台管理员") + @TableField("operate_user") + private String operateUser; + + @ApiModelProperty(value = "操作状态") + @TableField("process_status") + private ProcessStatus processStatus; + + @ApiModelProperty(value = "备注") + @TableField("note") + private String note; + +} diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/order/OrderReturnApply.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/order/OrderReturnApply.java new file mode 100644 index 0000000..affff1d --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/order/OrderReturnApply.java @@ -0,0 +1,111 @@ +package com.atguigu.ssyx.model.order; + +import com.atguigu.ssyx.model.base.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +@Data +@ApiModel(description = "OrderReturnApply") +@TableName("order_return_apply") +public class OrderReturnApply extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "订单id") + @TableField("order_id") + private Long orderId; + + @ApiModelProperty(value = "团长门店id") + @TableField("leader_id") + private Long leaderId; + + @ApiModelProperty(value = "退货商品id") + @TableField("sku_id") + private Long skuId; + + @ApiModelProperty(value = "订单编号") + @TableField("order_sn") + private String orderSn; + + @ApiModelProperty(value = "会员用户名") + @TableField("name") + private String name; + + @ApiModelProperty(value = "退款金额") + @TableField("return_amount") + private String returnAmount; + + @ApiModelProperty(value = "退货人姓名") + @TableField("return_name") + private String returnName; + + @ApiModelProperty(value = "退货人电话") + @TableField("return_phone") + private String returnPhone; + + @ApiModelProperty(value = "申请状态：0->待处理；1->退货中；2->已完成；3->已拒绝") + @TableField("status") + private Integer status; + + @ApiModelProperty(value = "处理时间") + @TableField("handle_time") + private Date handleTime; + + @ApiModelProperty(value = "商品图片") + @TableField("sku_pic") + private String skuPic; + + @ApiModelProperty(value = "商品名称") + @TableField("spu_name") + private String spuName; + + @ApiModelProperty(value = "退货数量") + @TableField("sku_num") + private Integer skuNum; + + @ApiModelProperty(value = "商品单价") + @TableField("sku_price") + private String skuPrice; + + @ApiModelProperty(value = "商品实际支付单价") + @TableField("sku_real_price") + private String skuRealPrice; + + @ApiModelProperty(value = "原因") + @TableField("reason") + private String reason; + + @ApiModelProperty(value = "描述") + @TableField("description") + private String description; + + @ApiModelProperty(value = "凭证图片，以逗号隔开") + @TableField("proof_pics") + private String proofPics; + + @ApiModelProperty(value = "处理备注") + @TableField("handle_note") + private String handleNote; + + @ApiModelProperty(value = "处理人员") + @TableField("handle_man") + private String handleMan; + + @ApiModelProperty(value = "收货人") + @TableField("receive_man") + private String receiveMan; + + @ApiModelProperty(value = "收货时间") + @TableField("receive_time") + private Date receiveTime; + + @ApiModelProperty(value = "收货备注") + @TableField("receive_note") + private String receiveNote; + +} diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/order/OrderReturnReason.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/order/OrderReturnReason.java new file mode 100644 index 0000000..7125be8 --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/order/OrderReturnReason.java @@ -0,0 +1,29 @@ +package com.atguigu.ssyx.model.order; + +import com.atguigu.ssyx.model.base.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel(description = "OrderReturnReason") +@TableName("order_return_reason") +public class OrderReturnReason extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "退货类型") + @TableField("name") + private String name; + + @ApiModelProperty(value = "sort") + @TableField("sort") + private Integer sort; + + @ApiModelProperty(value = "状态：0->不启用；1->启用") + @TableField("status") + private Integer status; + +} diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/order/OrderSet.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/order/OrderSet.java new file mode 100644 index 0000000..9444139 --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/order/OrderSet.java @@ -0,0 +1,40 @@ +package com.atguigu.ssyx.model.order; + +import com.atguigu.ssyx.model.base.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +@Data +@ApiModel(description = "OrderSet") +@TableName("order_set") +public class OrderSet extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "秒杀订单超时关闭时间(分)") + @TableField("seckill_order_overtime") + private Integer seckillOrderOvertime; + + @ApiModelProperty(value = "正常订单超时时间(分)") + @TableField("normal_order_overtime") + private Integer normalOrderOvertime; + + @ApiModelProperty(value = "发货后自动确认收货时间（天）") + @TableField("confirm_overtime") + private Integer confirmOvertime; + + @ApiModelProperty(value = "自动完成交易时间，不能申请售后（天）") + @TableField("finish_overtime") + private Integer finishOvertime; + + @ApiModelProperty(value = "佣金分成比例") + @TableField("profit_rate") + private BigDecimal profitRate; + + +} diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/order/PaymentInfo.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/order/PaymentInfo.java new file mode 100644 index 0000000..78336e9 --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/order/PaymentInfo.java @@ -0,0 +1,62 @@ +package com.atguigu.ssyx.model.order; + +import com.atguigu.ssyx.enums.PaymentStatus; +import com.atguigu.ssyx.enums.PaymentType; +import com.atguigu.ssyx.model.base.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +@Data +@ApiModel(description = "PaymentInfo") +@TableName("payment_info") +public class PaymentInfo extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "对外业务编号") + @TableField("order_no") + private String orderNo; + + @ApiModelProperty(value = "订单编号") + @TableField("order_id") + private Long orderId; + + @ApiModelProperty(value = "用户id") + @TableField("user_id") + private Long userId; + + @ApiModelProperty(value = "支付类型（微信支付宝）") + @TableField("payment_type") + private PaymentType paymentType; + + @ApiModelProperty(value = "交易编号") + @TableField("trade_no") + private String tradeNo; + + @ApiModelProperty(value = "支付金额") + @TableField("total_amount") + private BigDecimal totalAmount; + + @ApiModelProperty(value = "交易内容") + @TableField("subject") + private String subject; + + @ApiModelProperty(value = "支付状态") + @TableField("payment_status") + private PaymentStatus paymentStatus; + + @ApiModelProperty(value = "回调时间") + @TableField("callback_time") + private Date callbackTime; + + @ApiModelProperty(value = "回调信息") + @TableField("callback_content") + private String callbackContent; + +} diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/order/RefundInfo.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/order/RefundInfo.java new file mode 100644 index 0000000..db07206 --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/order/RefundInfo.java @@ -0,0 +1,59 @@ +package com.atguigu.ssyx.model.order; + +import com.atguigu.ssyx.model.base.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +@Data +@ApiModel(description = "RefundInfo") +@TableName("refund_info") +public class RefundInfo extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "对外业务编号") + @TableField("out_trade_no") + private String outTradeNo; + + @ApiModelProperty(value = "订单编号") + @TableField("order_id") + private Long orderId; + + @ApiModelProperty(value = "skuId") + @TableField("sku_id") + private Long skuId; + + @ApiModelProperty(value = "支付类型（微信支付宝）") + @TableField("payment_type") + private String paymentType; + + @ApiModelProperty(value = "交易编号") + @TableField("trade_no") + private String tradeNo; + + @ApiModelProperty(value = "退款金额") + @TableField("total_amount") + private String totalAmount; + + @ApiModelProperty(value = "交易内容") + @TableField("subject") + private String subject; + + @ApiModelProperty(value = "退款状态") + @TableField("refund_status") + private String refundStatus; + + @ApiModelProperty(value = "回调时间") + @TableField("callback_time") + private Date callbackTime; + + @ApiModelProperty(value = "回调信息") + @TableField("callback_content") + private String callbackContent; + +} diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/product/Attr.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/product/Attr.java new file mode 100644 index 0000000..e2b1b6a --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/product/Attr.java @@ -0,0 +1,33 @@ +package com.atguigu.ssyx.model.product; + +import com.atguigu.ssyx.model.base.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel(description = "Attr") +@TableName("attr") +public class Attr extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "属性名") + @TableField("name") + private String name; + + @ApiModelProperty(value = "属性录入方式：0->手工录入；1->从列表中选取") + @TableField("input_type") + private Integer inputType; + + @ApiModelProperty(value = "可选值列表[用逗号分隔]") + @TableField("select_list") + private String selectList; + + @ApiModelProperty(value = "属性分组id") + @TableField("attr_group_id") + private Long attrGroupId; + +} diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/product/AttrGroup.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/product/AttrGroup.java new file mode 100644 index 0000000..30fb392 --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/product/AttrGroup.java @@ -0,0 +1,29 @@ +package com.atguigu.ssyx.model.product; + +import com.atguigu.ssyx.model.base.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel(description = "AttrGroup") +@TableName("attr_group") +public class AttrGroup extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "组名") + @TableField("name") + private String name; + + @ApiModelProperty(value = "排序") + @TableField("sort") + private Integer sort; + + @ApiModelProperty(value = "备注") + @TableField("remark") + private String remark; + +} diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/product/Category.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/product/Category.java new file mode 100644 index 0000000..58d20d8 --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/product/Category.java @@ -0,0 +1,37 @@ +package com.atguigu.ssyx.model.product; + +import com.atguigu.ssyx.model.base.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel(description = "Category") +@TableName("category") +public class Category extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "分类名称") + @TableField("name") + private String name; + + @ApiModelProperty(value = "图标") + @TableField("img_url") + private String imgUrl; + + @ApiModelProperty(value = "父分类id") + @TableField("parent_id") + private Long parentId; + + @ApiModelProperty(value = "是否显示[0-不显示，1显示]") + @TableField("status") + private Integer status; + + @ApiModelProperty(value = "排序") + @TableField("sort") + private Integer sort; + +} diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/product/Comment.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/product/Comment.java new file mode 100644 index 0000000..4c9bdf3 --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/product/Comment.java @@ -0,0 +1,65 @@ +package com.atguigu.ssyx.model.product; + +import com.atguigu.ssyx.model.base.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel(description = "Comment") +@TableName("comment") +public class Comment extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "sku_id") + @TableField("sku_id") + private Long skuId; + + @ApiModelProperty(value = "商品名字") + @TableField("sku_name") + private String skuName; + + @ApiModelProperty(value = "会员昵称") + @TableField("nick_name") + private String nickName; + + @ApiModelProperty(value = "用户头像") + @TableField("icon") + private String icon; + + @ApiModelProperty(value = "星级") + @TableField("star") + private Boolean star; + + @ApiModelProperty(value = "会员ip") + @TableField("ip") + private String ip; + + @ApiModelProperty(value = "显示状态[0-不显示，1-显示]") + @TableField("status") + private Boolean status; + + @ApiModelProperty(value = "点赞数") + @TableField("follow_count") + private Integer followCount; + + @ApiModelProperty(value = "回复数") + @TableField("reply_count") + private Integer replyCount; + + @ApiModelProperty(value = "评论图片/视频[json数据；[{type:文件类型,url:资源路径}]]") + @TableField("resources") + private String resources; + + @ApiModelProperty(value = "内容") + @TableField("content") + private String content; + + @ApiModelProperty(value = "评论类型[0 - 对商品的直接评论，1 - 对评论的回复]") + @TableField("type") + private Integer type; + +} diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/product/CommentReplay.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/product/CommentReplay.java new file mode 100644 index 0000000..c2c75f9 --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/product/CommentReplay.java @@ -0,0 +1,33 @@ +package com.atguigu.ssyx.model.product; + +import com.atguigu.ssyx.model.base.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel(description = "CommentReplay") +@TableName("comment_replay") +public class CommentReplay extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "commentId") + @TableField("comment_id") + private Long commentId; + + @ApiModelProperty(value = "nickName") + @TableField("nick_name") + private String nickName; + + @ApiModelProperty(value = "icon") + @TableField("icon") + private String icon; + + @ApiModelProperty(value = "content") + @TableField("content") + private String content; + +} diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/product/SkuAttrValue.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/product/SkuAttrValue.java new file mode 100644 index 0000000..7fc5f25 --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/product/SkuAttrValue.java @@ -0,0 +1,37 @@ +package com.atguigu.ssyx.model.product; + +import com.atguigu.ssyx.model.base.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel(description = "SkuAttrValue") +@TableName("sku_attr_value") +public class SkuAttrValue extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "商品id") + @TableField("sku_id") + private Long skuId; + + @ApiModelProperty(value = "属性id") + @TableField("attr_id") + private Long attrId; + + @ApiModelProperty(value = "属性名") + @TableField("attr_name") + private String attrName; + + @ApiModelProperty(value = "属性值") + @TableField("attr_value") + private String attrValue; + + @ApiModelProperty(value = "顺序") + @TableField("sort") + private Integer sort; + +} diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/product/SkuImage.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/product/SkuImage.java new file mode 100644 index 0000000..2270847 --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/product/SkuImage.java @@ -0,0 +1,33 @@ +package com.atguigu.ssyx.model.product; + +import com.atguigu.ssyx.model.base.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel(description = "SkuImages") +@TableName("sku_image") +public class SkuImage extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "sku_id") + @TableField("sku_id") + private Long skuId; + + @ApiModelProperty(value = "图片名称") + @TableField("img_name") + private String imgName; + + @ApiModelProperty(value = "图片地址") + @TableField("img_url") + private String imgUrl; + + @ApiModelProperty(value = "排序") + @TableField("sort") + private Integer sort; + +} diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/product/SkuInfo.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/product/SkuInfo.java new file mode 100644 index 0000000..a8064cf --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/product/SkuInfo.java @@ -0,0 +1,90 @@ +package com.atguigu.ssyx.model.product; + +import com.atguigu.ssyx.model.base.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +@Data +@ApiModel(description = "SkuInfo") +@TableName("sku_info") +public class SkuInfo extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "分类id") + @TableField("category_id") + private Long categoryId; + + @ApiModelProperty(value = "平台属性分组id") + @TableField("attr_group_id") + private Long attrGroupId; + + @ApiModelProperty(value = "商品类型：0->普通商品 1->秒杀商品") + @TableField("sku_type") + private Integer skuType; + + @ApiModelProperty(value = "spu名称") + @TableField("sku_name") + private String skuName; + + @ApiModelProperty(value = "展示图片") + @TableField("img_url") + private String imgUrl; + + @ApiModelProperty(value = "限购个数/每天（0：不限购）") + @TableField("per_limit") + private Integer perLimit; + + @ApiModelProperty(value = "上架状态：0->下架；1->上架") + @TableField("publish_status") + private Integer publishStatus; + + @ApiModelProperty(value = "审核状态：0->未审核；1->审核通过") + @TableField("check_status") + private Integer checkStatus; + + @ApiModelProperty(value = "是否新人专享：0->否；1->是") + @TableField("is_new_person") + private Integer isNewPerson; + + @ApiModelProperty(value = "排序") + @TableField("sort") + private Integer sort; + + @ApiModelProperty(value = "sku编码") + @TableField("sku_code") + private String skuCode; + + @ApiModelProperty(value = "价格") + @TableField("price") + private BigDecimal price; + + @ApiModelProperty(value = "市场价") + @TableField("market_price") + private BigDecimal marketPrice; + + @ApiModelProperty(value = "库存") + @TableField("stock") + private Integer stock; + + @ApiModelProperty(value = "锁定库存") + @TableField("lock_stock") + private Integer lockStock; + + @ApiModelProperty(value = "预警库存") + @TableField("low_stock") + private Integer lowStock; + + @ApiModelProperty(value = "销量") + @TableField("sale") + private Integer sale; + + @ApiModelProperty(value = "仓库") + @TableField("ware_id") + private Long wareId; +} diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/product/SkuPoster.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/product/SkuPoster.java new file mode 100644 index 0000000..01ea8d6 --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/product/SkuPoster.java @@ -0,0 +1,35 @@ +package com.atguigu.ssyx.model.product; + +import com.atguigu.ssyx.model.base.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + *

+ * SpuPoster + *

+ */ +@Data +@ApiModel(description = "SkuPoster") +@TableName("sku_poster") +public class SkuPoster extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "商品id") + @TableField("sku_id") + private Long skuId; + + @ApiModelProperty(value = "文件名称") + @TableField("img_name") + private String imgName; + + @ApiModelProperty(value = "文件路径") + @TableField("img_url") + private String imgUrl; + +} + diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/product/SkuStockHistory.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/product/SkuStockHistory.java new file mode 100644 index 0000000..605b388 --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/product/SkuStockHistory.java @@ -0,0 +1,43 @@ +package com.atguigu.ssyx.model.product; + +import com.atguigu.ssyx.model.base.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +@Data +@ApiModel(description = "SkuStockHistory") +@TableName("sku_stock_history") +public class SkuStockHistory extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "skuId") + @TableField("sku_id") + private Long skuId; + + @ApiModelProperty(value = "销售价格") + @TableField("price") + private String price; + + @ApiModelProperty(value = "库存") + @TableField("stock") + private Integer stock; + + @ApiModelProperty(value = "销量") + @TableField("sale") + private Integer sale; + + @ApiModelProperty(value = "销售日期") + @TableField("sale_date") + private Date saleDate; + + @ApiModelProperty(value = "仓库") + @TableField("ware_id") + private Long wareId; + +} diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/search/LeaderEs.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/search/LeaderEs.java new file mode 100644 index 0000000..0d157b3 --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/search/LeaderEs.java @@ -0,0 +1,35 @@ +package com.atguigu.ssyx.model.search; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.elasticsearch.common.geo.GeoPoint; +import org.springframework.data.annotation.Id; +import org.springframework.data.elasticsearch.annotations.*; + +import java.util.Date; + +@Data +@Document(indexName = "leaderes", shards = 3, replicas = 1) +public class LeaderEs { + + @Id + private Long id; + + @Field(type = FieldType.Keyword, index = false) + private String takeName; + + //https://blog.csdn.net/zaishijizhidian/article/details/81015988 + @GeoPointField + private GeoPoint location; //x:经度 y:纬度 + + @Field(type = FieldType.Keyword, index = false) + private String storePath; + + @Field(type = FieldType.Keyword, index = false) + private String detailAddress; + + @Field(type = FieldType.Double, index = false) + private Double distance; +} diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/search/SkuEs.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/search/SkuEs.java new file mode 100644 index 0000000..a67579a --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/search/SkuEs.java @@ -0,0 +1,68 @@ +package com.atguigu.ssyx.model.search; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springframework.data.annotation.Id; +import org.springframework.data.elasticsearch.annotations.DateFormat; +import org.springframework.data.elasticsearch.annotations.Document; +import org.springframework.data.elasticsearch.annotations.Field; +import org.springframework.data.elasticsearch.annotations.FieldType; + +import java.util.Date; +import java.util.List; + +@Data +@Document(indexName = "skues", shards = 3, replicas = 1) +public class SkuEs { + + // 商品Id= skuId + @Id + private Long id; + + @Field(type = FieldType.Text, analyzer = "ik_max_word") + private String keyword; + + @Field(type = FieldType.Integer, index = false) + private Integer skuType; + + @Field(type = FieldType.Integer, index = false) + private Integer isNewPerson; + + @Field(type = FieldType.Long) + private Long categoryId; + + @Field(type = FieldType.Text) + private String categoryName; + + @Field(type = FieldType.Keyword, index = false) + private String imgUrl; + + // es 中能分词的字段，这个字段数据类型必须是 text！keyword 不分词！ + @Field(type = FieldType.Text) + private String title; + + @Field(type = FieldType.Double) + private Double price; + + @Field(type = FieldType.Integer, index = false) + private Integer stock; + + @Field(type = FieldType.Integer, index = false) + private Integer perLimit; + + @Field(type = FieldType.Integer, index = false) + private Integer sale; + + @Field(type = FieldType.Long) + private Long wareId; + + // 商品的热度！ + @Field(type = FieldType.Long) + private Long hotScore = 0L; + + @Field(type = FieldType.Object, index = false) + private List ruleList; + +} diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/sys/Region.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/sys/Region.java new file mode 100644 index 0000000..c935f4a --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/sys/Region.java @@ -0,0 +1,29 @@ +package com.atguigu.ssyx.model.sys; + +import com.atguigu.ssyx.model.base.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel(description = "Region") +@TableName("region") +public class Region extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "上级id") + @TableField("parent_id") + private Long parentId; + + @ApiModelProperty(value = "名称") + @TableField("name") + private String name; + + @ApiModelProperty(value = "是否包含子节点") + @TableField(exist = false) + private boolean hasChildren; + +} diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/sys/RegionWare.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/sys/RegionWare.java new file mode 100644 index 0000000..4347ba8 --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/sys/RegionWare.java @@ -0,0 +1,37 @@ +package com.atguigu.ssyx.model.sys; + +import com.atguigu.ssyx.model.base.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel(description = "RegionWare") +@TableName("region_ware") +public class RegionWare extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "开通区域") + @TableField("region_id") + private Long regionId; + + @ApiModelProperty(value = "区域名称") + @TableField("region_name") + private String regionName; + + @ApiModelProperty(value = "仓库") + @TableField("ware_id") + private Long wareId; + + @ApiModelProperty(value = "仓库名称") + @TableField("ware_name") + private String wareName; + + @ApiModelProperty(value = "状态（0：未开通 1：已开通）") + @TableField("status") + private Integer status; + +} diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/sys/Ware.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/sys/Ware.java new file mode 100644 index 0000000..3107f23 --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/sys/Ware.java @@ -0,0 +1,45 @@ +package com.atguigu.ssyx.model.sys; + +import com.atguigu.ssyx.model.base.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel(description = "Ware") +@TableName("ware") +public class Ware extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "名称") + @TableField("name") + private String name; + + @ApiModelProperty(value = "省code") + @TableField("province") + private String province; + + @ApiModelProperty(value = "城市code") + @TableField("city") + private String city; + + @ApiModelProperty(value = "区域code") + @TableField("district") + private String district; + + @ApiModelProperty(value = "详细地址") + @TableField("detail_address") + private String detailAddress; + + @ApiModelProperty(value = "经度") + @TableField("longitude") + private String longitude; + + @ApiModelProperty(value = "纬度") + @TableField("latitude") + private String latitude; + +} diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/user/Driver.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/user/Driver.java new file mode 100644 index 0000000..43733e9 --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/user/Driver.java @@ -0,0 +1,29 @@ +package com.atguigu.ssyx.model.user; + +import com.atguigu.ssyx.model.base.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel(description = "Driver") +@TableName("driver") +public class Driver extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "名称") + @TableField("name") + private String name; + + @ApiModelProperty(value = "手机") + @TableField("phone") + private String phone; + + @ApiModelProperty(value = "仓库id") + @TableField("ware_id") + private Long wareId; + +} diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/user/Leader.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/user/Leader.java new file mode 100644 index 0000000..7d407aa --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/user/Leader.java @@ -0,0 +1,113 @@ +package com.atguigu.ssyx.model.user; + +import com.atguigu.ssyx.model.base.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +@Data +@ApiModel(description = "Leader") +@TableName("leader") +public class Leader extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "用户id") + @TableField("user_id") + private Long userId; + + @ApiModelProperty(value = "区域id") + @TableField("region_id") + private Long regionId; + + @ApiModelProperty(value = "名称") + @TableField("name") + private String name; + + @ApiModelProperty(value = "手机号码") + @TableField("phone") + private String phone; + + @ApiModelProperty(value = "身份证") + @TableField("id_no") + private String idNo; + + @ApiModelProperty(value = "身份证图片路径") + @TableField("id_no_url1") + private String idNoUrl1; + + @ApiModelProperty(value = "身份证图片路径") + @TableField("id_no_url2") + private String idNoUrl2; + + @ApiModelProperty(value = "提货点名称") + @TableField("take_name") + private String takeName; + + @ApiModelProperty(value = "提货点类型；1->宝妈；2->便利店店主；3->快递站点；4->物业中心") + @TableField("take_type") + private String takeType; + + @ApiModelProperty(value = "省c") + @TableField("province") + private Long province; + + @ApiModelProperty(value = "城市") + @TableField("city") + private Long city; + + @ApiModelProperty(value = "区域") + @TableField("district") + private Long district; + + @ApiModelProperty(value = "详细地址") + @TableField("detail_address") + private String detailAddress; + + @ApiModelProperty(value = "经度") + @TableField("longitude") + private Double longitude; + + @ApiModelProperty(value = "纬度") + @TableField("latitude") + private Double latitude; + + @ApiModelProperty(value = "有无门店") + @TableField("have_store") + private Integer haveStore; + + @ApiModelProperty(value = "门店照片") + @TableField("store_path") + private String storePath; + + @ApiModelProperty(value = "营业时间") + @TableField("work_time") + private String workTime; + + @ApiModelProperty(value = "营业状态") + @TableField("work_status") + private Integer workStatus; + + @ApiModelProperty(value = "审核状态") + @TableField("check_status") + private Integer checkStatus; + + @ApiModelProperty(value = "审核时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @TableField("check_time") + private Date checkTime; + + @ApiModelProperty(value = "审核用户") + @TableField("check_user") + private String checkUser; + + @ApiModelProperty(value = "审核内容") + @TableField("check_content") + private String checkContent; + +} diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/user/LeaderAccount.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/user/LeaderAccount.java new file mode 100644 index 0000000..8635f1f --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/user/LeaderAccount.java @@ -0,0 +1,35 @@ +package com.atguigu.ssyx.model.user; + +import com.atguigu.ssyx.model.base.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +@Data +@ApiModel(description = "LeaderAccount") +@TableName("leader_account") +public class LeaderAccount extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "团长ID") + @TableField("leader_id") + private Long leaderId; + + @ApiModelProperty(value = "总收益, 可能有部分余额因为订单未结束而不能提现") + @TableField("total_amount") + private BigDecimal totalAmount; + + @ApiModelProperty(value = "可提现余额") + @TableField("available_amount") + private BigDecimal availableAmount; + + @ApiModelProperty(value = "冻结余额") + @TableField("frozen_amount") + private BigDecimal frozenAmount; + +} diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/user/LeaderBank.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/user/LeaderBank.java new file mode 100644 index 0000000..29fce45 --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/user/LeaderBank.java @@ -0,0 +1,41 @@ +package com.atguigu.ssyx.model.user; + +import com.atguigu.ssyx.model.base.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel(description = "LeaderBank") +@TableName("leader_bank") +public class LeaderBank extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "团长ID") + @TableField("leader_id") + private String leaderId; + + @ApiModelProperty(value = "账户类型(微信,银行)") + @TableField("account_type") + private String accountType; + + @ApiModelProperty(value = "银行名称") + @TableField("bank_name") + private String bankName; + + @ApiModelProperty(value = "银行账号") + @TableField("bank_account_no") + private String bankAccountNo; + + @ApiModelProperty(value = "银行账户名") + @TableField("bank_account_name") + private String bankAccountName; + + @ApiModelProperty(value = "微信ID") + @TableField("wechat_id") + private String wechatId; + +} diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/user/LeaderBill.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/user/LeaderBill.java new file mode 100644 index 0000000..349ea4e --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/user/LeaderBill.java @@ -0,0 +1,61 @@ +package com.atguigu.ssyx.model.user; + +import com.atguigu.ssyx.enums.BillType; +import com.atguigu.ssyx.model.base.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +@Data +@ApiModel(description = "LeaderBill") +@TableName("leader_bill") +public class LeaderBill extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "团长ID") + @TableField("leader_id") + private Long leaderId; + + @ApiModelProperty(value = "账单类型") + @TableField("bill_type") + private BillType billType; + + @ApiModelProperty(value = "业务编号") + @TableField("business_no") + private String businessNo; + + @ApiModelProperty(value = "交易时间") + @TableField("bill_time") + private Date billTime; + + @ApiModelProperty(value = "账单金额") + @TableField("bill_amount") + private BigDecimal billAmount; + + @ApiModelProperty(value = "账单编号") + @TableField("bill_no") + private String billNo; + + @ApiModelProperty(value = "账单描述") + @TableField("bill_desc") + private String billDesc; + + @ApiModelProperty(value = "交易前资金余额") + @TableField("balance_before") + private BigDecimal balanceBefore; + + @ApiModelProperty(value = "交易后资金余额") + @TableField("balance_after") + private BigDecimal balanceAfter; + + @ApiModelProperty(value = "账单状态") + @TableField("bill_status") + private Integer billStatus; + +} diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/user/LeaderUser.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/user/LeaderUser.java new file mode 100644 index 0000000..9078ac1 --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/user/LeaderUser.java @@ -0,0 +1,25 @@ +package com.atguigu.ssyx.model.user; + +import com.atguigu.ssyx.model.base.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel(description = "LeaderUser") +@TableName("leader_user") +public class LeaderUser extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "团长ID") + @TableField("leader_id") + private String leaderId; + + @ApiModelProperty(value = "userId") + @TableField("user_id") + private Long userId; + +} diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/user/LeaderWithdraw.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/user/LeaderWithdraw.java new file mode 100644 index 0000000..143bbbf --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/user/LeaderWithdraw.java @@ -0,0 +1,91 @@ +package com.atguigu.ssyx.model.user; + +import com.atguigu.ssyx.model.base.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +@Data +@ApiModel(description = "LeaderWithdraw") +@TableName("leader_withdraw") +public class LeaderWithdraw extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "团长ID") + @TableField("leader_id") + private String leaderId; + + @ApiModelProperty(value = "提现金额") + @TableField("merchant_amount") + private String merchantAmount; + + @ApiModelProperty(value = "提现状态") + @TableField("merchant_status") + private String merchantStatus; + + @ApiModelProperty(value = "提现失败原因") + @TableField("fail_reason") + private String failReason; + + @ApiModelProperty(value = "提现支付方式") + @TableField("payment_method") + private String paymentMethod; + + @ApiModelProperty(value = "银行名称") + @TableField("bank_name") + private String bankName; + + @ApiModelProperty(value = "银行账号") + @TableField("bank_account_no") + private String bankAccountNo; + + @ApiModelProperty(value = "银行账户名") + @TableField("bank_account_name") + private String bankAccountName; + + @ApiModelProperty(value = "微信ID") + @TableField("wechat_id") + private String wechatId; + + @ApiModelProperty(value = "提现时间") + @TableField("withdraw_time") + private Date withdrawTime; + + @ApiModelProperty(value = "审核时间") + @TableField("verify_time") + private Date verifyTime; + + @ApiModelProperty(value = "打款时间") + @TableField("transfer_time") + private Date transferTime; + + @ApiModelProperty(value = "提现交易编号") + @TableField("withdraw_no") + private String withdrawNo; + + @ApiModelProperty(value = "审核拒绝理由") + @TableField("reject_reason") + private String rejectReason; + + @ApiModelProperty(value = "提现成功时间") + @TableField("complete_time") + private Date completeTime; + + @ApiModelProperty(value = "提现金额") + @TableField("payment_amount") + private String paymentAmount; + + @ApiModelProperty(value = "手续费") + @TableField("tax_amount") + private String taxAmount; + + @ApiModelProperty(value = "备注") + @TableField("memo") + private String memo; + +} diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/user/User.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/user/User.java new file mode 100644 index 0000000..b7c9114 --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/user/User.java @@ -0,0 +1,57 @@ +package com.atguigu.ssyx.model.user; + +import com.atguigu.ssyx.enums.UserType; +import com.atguigu.ssyx.model.base.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel(description = "User") +@TableName("user") +public class User extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @TableField("user_type") + private UserType userType; + + @ApiModelProperty(value = "会员头像") + @TableField("photo_url") + private String photoUrl; + + @ApiModelProperty(value = "昵称") + @TableField("nick_name") + private String nickName; + + @ApiModelProperty(value = "身份证号码") + @TableField("id_no") + private String idNo; + + @ApiModelProperty(value = "性别") + @TableField("sex") + private String sex; + + @ApiModelProperty(value = "电话号码") + @TableField("phone") + private String phone; + + @ApiModelProperty(value = "备注") + @TableField("memo") + private String memo; + + @ApiModelProperty(value = "小程序open id") + @TableField("open_id") + private String openId; + + @ApiModelProperty(value = "微信开放平台unionID") + @TableField("union_id") + private String unionId; + + @ApiModelProperty(value = "是否新用户") + @TableField("is_new") + private Integer isNew; + +} diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/user/UserDelivery.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/user/UserDelivery.java new file mode 100644 index 0000000..049a1ba --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/user/UserDelivery.java @@ -0,0 +1,33 @@ +package com.atguigu.ssyx.model.user; + +import com.atguigu.ssyx.model.base.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel(description = "UserDelivery") +@TableName("user_delivery") +public class UserDelivery extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "会员ID") + @TableField("user_id") + private Long userId; + + @ApiModelProperty(value = "团长id") + @TableField("leader_id") + private Long leaderId; + + @ApiModelProperty(value = "仓库id") + @TableField("ware_id") + private Long wareId; + + @ApiModelProperty(value = "是否默认") + @TableField("is_default") + private Integer isDefault; + +} diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/user/UserLoginLog.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/user/UserLoginLog.java new file mode 100644 index 0000000..aa50280 --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/model/user/UserLoginLog.java @@ -0,0 +1,33 @@ +package com.atguigu.ssyx.model.user; + +import com.atguigu.ssyx.model.base.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel(description = "UserLoginLog") +@TableName("user_login_log") +public class UserLoginLog extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "用户id") + @TableField("user_id") + private Long userId; + + @ApiModelProperty(value = "登录ip") + @TableField("ip") + private String ip; + + @ApiModelProperty(value = "登录城市") + @TableField("city") + private String city; + + @ApiModelProperty(value = "登录类型【0-web，1-移动】") + @TableField("type") + private Boolean type; + +} diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/acl/AdminLoginVo.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/acl/AdminLoginVo.java new file mode 100644 index 0000000..5b7e94f --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/acl/AdminLoginVo.java @@ -0,0 +1,24 @@ +package com.atguigu.ssyx.vo.acl; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel(description = "管理员登录信息") +public class AdminLoginVo implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "管理员id") + private Long adminId; + + @ApiModelProperty(value = "姓名") + private String name; + + @ApiModelProperty(value = "仓库id") + private Long wareId; + +} diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/acl/AdminQueryVo.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/acl/AdminQueryVo.java new file mode 100644 index 0000000..3cc7fd3 --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/acl/AdminQueryVo.java @@ -0,0 +1,32 @@ +// +// +package com.atguigu.ssyx.vo.acl; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 用户查询实体 + *

+ * + * @author qy + * @since 2019-11-08 + */ +@Data +@ApiModel(description = "用户查询实体") +public class AdminQueryVo implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "用户名") + private String username; + + @ApiModelProperty(value = "昵称") + private String name; + +} + diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/acl/RoleQueryVo.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/acl/RoleQueryVo.java new file mode 100644 index 0000000..2261f04 --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/acl/RoleQueryVo.java @@ -0,0 +1,29 @@ +// +// +package com.atguigu.ssyx.vo.acl; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 角色查询实体 + *

+ * + * @author qy + * @since 2019-11-08 + */ +@Data +@ApiModel(description = "角色查询实体") +public class RoleQueryVo implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "角色名称") + private String roleName; + +} + diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/activity/ActivityRuleVo.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/activity/ActivityRuleVo.java new file mode 100644 index 0000000..44095fd --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/activity/ActivityRuleVo.java @@ -0,0 +1,30 @@ +package com.atguigu.ssyx.vo.activity; + +import com.atguigu.ssyx.model.activity.ActivityRule; +import com.atguigu.ssyx.model.activity.ActivitySku; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@ApiModel(description = "活动规则") +public class ActivityRuleVo implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "活动id") + private Long activityId; + + @ApiModelProperty(value = "活动规则list") + private List activityRuleList; + + @ApiModelProperty(value = "活动参与商品list") + private List activitySkuList; + + @ApiModelProperty(value = "优惠券id列表") + private List couponIdList; + +} diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/activity/CouponRuleVo.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/activity/CouponRuleVo.java new file mode 100644 index 0000000..19f087d --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/activity/CouponRuleVo.java @@ -0,0 +1,37 @@ +package com.atguigu.ssyx.vo.activity; + +import com.atguigu.ssyx.enums.CouponRangeType; +import com.atguigu.ssyx.model.activity.CouponRange; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.List; + +@Data +@ApiModel(description = "优惠券规则") +public class CouponRuleVo implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "优惠券id") + private Long couponId; + + @ApiModelProperty(value = "范围类型") + private CouponRangeType rangeType; + + @ApiModelProperty(value = "金额") + private BigDecimal amount; + + @ApiModelProperty(value = "使用门槛 0->没门槛") + private BigDecimal conditionAmount; + + @ApiModelProperty(value = "优惠券参与的商品list") + private List couponRangeList; + + @ApiModelProperty(value = "优惠券范围描述") + private String rangeDesc; + +} diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/activity/SeckillQueryVo.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/activity/SeckillQueryVo.java new file mode 100644 index 0000000..b9fd6c2 --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/activity/SeckillQueryVo.java @@ -0,0 +1,20 @@ +package com.atguigu.ssyx.vo.activity; + +import lombok.Data; + +import java.util.Date; + +import io.swagger.annotations.ApiModelProperty; + +@Data +public class SeckillQueryVo { + + @ApiModelProperty(value = "活动标题") + private String title; + + @ApiModelProperty(value = "上下线状态") + private Integer status; + + +} + diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/activity/SeckillSkuNoticeVo.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/activity/SeckillSkuNoticeVo.java new file mode 100644 index 0000000..226b8b6 --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/activity/SeckillSkuNoticeVo.java @@ -0,0 +1,41 @@ +package com.atguigu.ssyx.vo.activity; + +import lombok.Data; + +import java.util.Date; + +import io.swagger.annotations.ApiModelProperty; + +@Data +public class SeckillSkuNoticeVo { + + @ApiModelProperty(value = "member_id") + private Long memberId; + + @ApiModelProperty(value = "sku_id") + private Long skuId; + + @ApiModelProperty(value = "活动场次id") + private Long sessionId; + + @ApiModelProperty(value = "订阅时间") + private Date subcribeTime; + + @ApiModelProperty(value = "发送时间") + private Date sendTime; + + @ApiModelProperty(value = "通知方式[0-短信，1-邮件]") + private Boolean noticeType; + + @ApiModelProperty(value = "创建时间") + private Date createTime; + + @ApiModelProperty(value = "更新时间") + private Date updateTime; + + @ApiModelProperty(value = "删除标记（0:不可用 1:可用）") + private Integer isDeleted; + + +} + diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/activity/SeckillSkuQueryVo.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/activity/SeckillSkuQueryVo.java new file mode 100644 index 0000000..4a3b672 --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/activity/SeckillSkuQueryVo.java @@ -0,0 +1,19 @@ +package com.atguigu.ssyx.vo.activity; + +import lombok.Data; + +import java.util.Date; + +import io.swagger.annotations.ApiModelProperty; + +@Data +public class SeckillSkuQueryVo { + + @ApiModelProperty(value = "秒杀活动id") + private Long seckillId; + + @ApiModelProperty(value = "活动场次id") + private Long seckillTimeId; + +} + diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/activity/SeckillSkuVo.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/activity/SeckillSkuVo.java new file mode 100644 index 0000000..ebd61aa --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/activity/SeckillSkuVo.java @@ -0,0 +1,58 @@ +package com.atguigu.ssyx.vo.activity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +@Data +@ApiModel(description = "秒杀商品信息") +public class SeckillSkuVo implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "秒杀商品主键id") + private Long seckillSkuId; + + @ApiModelProperty(value = "skuId") + private Long skuId; + + @ApiModelProperty(value = "spu名称") + private String skuName; + + @ApiModelProperty(value = "展示图片") + private String imgUrl; + + @ApiModelProperty(value = "秒杀价格") + private BigDecimal seckillPrice; + + @ApiModelProperty(value = "秒杀总量") + private Integer seckillStock; + + @ApiModelProperty(value = "每人限购数量") + private Integer seckillLimit; + + @ApiModelProperty(value = "秒杀销量") + private Integer seckillSale; + + @ApiModelProperty(value = "场次名称") + private String timeName; + + @ApiModelProperty(value = "每日开始时间") + @JsonFormat(pattern = "HH:mm:ss") + private Date startTime; + + @ApiModelProperty(value = "每日结束时间") + @JsonFormat(pattern = "HH:mm:ss") + private Date endTime; + + @ApiModelProperty(value = "场次状态 1：已开抢 2：抢购中 3：即将开抢") + @TableField(exist = false) + private Integer timeStaus; + +} diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/order/CartInfoVo.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/order/CartInfoVo.java new file mode 100644 index 0000000..a3097e3 --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/order/CartInfoVo.java @@ -0,0 +1,34 @@ +package com.atguigu.ssyx.vo.order; + +import com.atguigu.ssyx.model.activity.ActivityRule; +import com.atguigu.ssyx.model.order.CartInfo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + *

+ * OrderDetailActivity + *

+ * + * @author qy + */ +@Data +public class CartInfoVo implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 购物项凑单，同一活动对应的最优活动规则 + */ + @ApiModelProperty(value = "cartInfoList") + private List cartInfoList; + + @ApiModelProperty(value = "活动规则") + private ActivityRule activityRule; + + +} + diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/order/OrderConfirmVo.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/order/OrderConfirmVo.java new file mode 100644 index 0000000..09ef7ca --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/order/OrderConfirmVo.java @@ -0,0 +1,49 @@ +package com.atguigu.ssyx.vo.order; + +import com.atguigu.ssyx.model.activity.CouponInfo; +import com.atguigu.ssyx.vo.user.LeaderAddressVo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.List; + +/** + *

+ * OrderDetailActivity + *

+ * + * @author qy + */ +@Data +public class OrderConfirmVo implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "预生产订单号") + private String orderNo; + + @ApiModelProperty(value = "用户对应的团长地址") + private LeaderAddressVo leaderAddressVo; + + @ApiModelProperty(value = "购物项列表") + private List carInfoVoList; + + @ApiModelProperty(value = "订单优惠券列表") + private List couponInfoList; + + @ApiModelProperty(value = "促销优惠金额") + private BigDecimal activityReduceAmount; + + @ApiModelProperty(value = "优惠券优惠金额") + private BigDecimal couponReduceAmount; + + @ApiModelProperty(value = "购物车原始总金额") + private BigDecimal originalTotalAmount; + + @ApiModelProperty(value = "最终总金额") + private BigDecimal totalAmount; + +} + diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/order/OrderDeliverVo.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/order/OrderDeliverVo.java new file mode 100644 index 0000000..d63227b --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/order/OrderDeliverVo.java @@ -0,0 +1,36 @@ +package com.atguigu.ssyx.vo.order; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +@Data +@ApiModel(description = "OrderDeliver") +public class OrderDeliverVo implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "配送日期") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date deliverDate; + + @ApiModelProperty(value = "团长id") + private Long leaderId; + + @ApiModelProperty(value = "司机id") + private Long driverId; + + @ApiModelProperty(value = "司机名称") + private String driverName; + + @ApiModelProperty(value = "司机电话") + private String driverPhone; + + @ApiModelProperty(value = "状态（0：默认，1：已发货，2：团长收货）") + private Integer status; + +} diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/order/OrderItemMqVo.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/order/OrderItemMqVo.java new file mode 100644 index 0000000..e796d88 --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/order/OrderItemMqVo.java @@ -0,0 +1,25 @@ +package com.atguigu.ssyx.vo.order; + +import com.atguigu.ssyx.enums.SkuType; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel(description = "OrderItem") +public class OrderItemMqVo implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "商品类型：0->普通商品 1->秒杀商品") + private SkuType skuType; + + @ApiModelProperty(value = "商品sku编号") + private Long skuId; + + @ApiModelProperty(value = "商品购买的数量") + private Integer skuNum; + +} diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/order/OrderItemParamVo.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/order/OrderItemParamVo.java new file mode 100644 index 0000000..5809faa --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/order/OrderItemParamVo.java @@ -0,0 +1,25 @@ +package com.atguigu.ssyx.vo.order; + +import com.atguigu.ssyx.enums.SkuType; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel(description = "OrderItem") +public class OrderItemParamVo implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "商品类型：0->普通商品 1->秒杀商品") + private SkuType skuType; + + @ApiModelProperty(value = "商品sku编号") + private Long skuId; + + @ApiModelProperty(value = "商品购买的数量") + private Integer skuNum; + +} diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/order/OrderMqVo.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/order/OrderMqVo.java new file mode 100644 index 0000000..2584c0b --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/order/OrderMqVo.java @@ -0,0 +1,36 @@ +package com.atguigu.ssyx.vo.order; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.List; + +/** + *

+ * OrderDetailActivity + *

+ * + * @author qy + */ +@Data +public class OrderMqVo implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "订单号") + private String orderNo; + + @ApiModelProperty(value = "团长id") + private Long leaderId; + + @ApiModelProperty(value = "团长佣金") + private BigDecimal commissionAmount; + + @ApiModelProperty(value = "订单项列表") + private List orderItemMqVoList; + + +} + diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/order/OrderQueryVo.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/order/OrderQueryVo.java new file mode 100644 index 0000000..656e61a --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/order/OrderQueryVo.java @@ -0,0 +1,31 @@ +package com.atguigu.ssyx.vo.order; + +import com.atguigu.ssyx.enums.OrderStatus; +import lombok.Data; +import io.swagger.annotations.ApiModelProperty; + +@Data +public class OrderQueryVo { + + + @ApiModelProperty(value = "订单号") + private String orderNo; + + @ApiModelProperty(value = "收货人信息") + private String receiver; + + @ApiModelProperty(value = "订单状态") + private OrderStatus orderStatus; + + @ApiModelProperty(value = "团长id") + private Long leaderId; + + @ApiModelProperty(value = "仓库id") + private Long wareId; + + @ApiModelProperty(value = "创建时间") + private String createTimeBegin; + private String createTimeEnd; + +} + diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/order/OrderSubmitVo.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/order/OrderSubmitVo.java new file mode 100644 index 0000000..91efc9c --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/order/OrderSubmitVo.java @@ -0,0 +1,30 @@ +package com.atguigu.ssyx.vo.order; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class OrderSubmitVo { + + @ApiModelProperty(value = "使用预生产订单号防重") + private String orderNo; + + @ApiModelProperty(value = "用户id") + private Long userId; + + @ApiModelProperty(value = "团长id") + private Long leaderId; + + @ApiModelProperty(value = "收货人姓名") + private String receiverName; + + @ApiModelProperty(value = "收货人电话") + private String receiverPhone; + + @ApiModelProperty(value = "下单选中的优惠券id") + private Long couponId; + +// @ApiModelProperty("购买的sku信息") +// private List skuIdList; +} + diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/order/OrderUserQueryVo.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/order/OrderUserQueryVo.java new file mode 100644 index 0000000..57b645f --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/order/OrderUserQueryVo.java @@ -0,0 +1,16 @@ +package com.atguigu.ssyx.vo.order; + +import com.atguigu.ssyx.enums.OrderStatus; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class OrderUserQueryVo { + + private Long userId; + + @ApiModelProperty(value = "订单状态") + private OrderStatus orderStatus; + +} + diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/order/StockStatisticsVo.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/order/StockStatisticsVo.java new file mode 100644 index 0000000..b944936 --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/order/StockStatisticsVo.java @@ -0,0 +1,21 @@ +package com.atguigu.ssyx.vo.order; + +import com.baomidou.mybatisplus.annotation.TableField; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +public class StockStatisticsVo implements Serializable { + + @ApiModelProperty(value = "skuId") + private Long skuId; + + @ApiModelProperty(value = "销售价格") + private String price; + + @ApiModelProperty(value = "销量") + @TableField("sale") + private Integer sale; +} diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/product/AttrGroupQueryVo.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/product/AttrGroupQueryVo.java new file mode 100644 index 0000000..01bf58f --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/product/AttrGroupQueryVo.java @@ -0,0 +1,16 @@ +package com.atguigu.ssyx.vo.product; + +import lombok.Data; + +import java.util.Date; + +import io.swagger.annotations.ApiModelProperty; + +@Data +public class AttrGroupQueryVo { + + @ApiModelProperty(value = "组名") + private String name; + +} + diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/product/CategoryQueryVo.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/product/CategoryQueryVo.java new file mode 100644 index 0000000..f805564 --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/product/CategoryQueryVo.java @@ -0,0 +1,13 @@ +package com.atguigu.ssyx.vo.product; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class CategoryQueryVo { + + @ApiModelProperty(value = "分类名称") + private String name; + +} + diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/product/CategoryVo.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/product/CategoryVo.java new file mode 100644 index 0000000..5faafdf --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/product/CategoryVo.java @@ -0,0 +1,20 @@ +package com.atguigu.ssyx.vo.product; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel(description = "分类") +public class CategoryVo implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "分类id") + private Long id; + + @ApiModelProperty(value = "分类名称") + private String name; +} diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/product/SkuInfoQueryVo.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/product/SkuInfoQueryVo.java new file mode 100644 index 0000000..e7d3fca --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/product/SkuInfoQueryVo.java @@ -0,0 +1,22 @@ +package com.atguigu.ssyx.vo.product; + +import lombok.Data; + +import java.util.Date; + +import io.swagger.annotations.ApiModelProperty; + +@Data +public class SkuInfoQueryVo { + + @ApiModelProperty(value = "分类id") + private Long categoryId; + + @ApiModelProperty(value = "商品类型：0->普通商品 1->秒杀商品") + private String skuType; + + @ApiModelProperty(value = "spu名称") + private String keyword; + +} + diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/product/SkuInfoVo.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/product/SkuInfoVo.java new file mode 100644 index 0000000..0f72b07 --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/product/SkuInfoVo.java @@ -0,0 +1,26 @@ +package com.atguigu.ssyx.vo.product; + +import com.atguigu.ssyx.model.product.*; +import com.atguigu.ssyx.model.product.SkuAttrValue; +import com.atguigu.ssyx.model.product.SkuImage; +import com.atguigu.ssyx.model.product.SkuInfo; +import com.atguigu.ssyx.model.product.SkuPoster; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +@Data +public class SkuInfoVo extends SkuInfo { + + @ApiModelProperty(value = "海报列表") + private List skuPosterList; + + @ApiModelProperty(value = "属性值") + private List skuAttrValueList; + + @ApiModelProperty(value = "图片") + private List skuImagesList; + +} + diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/product/SkuStockLockVo.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/product/SkuStockLockVo.java new file mode 100644 index 0000000..aef99c1 --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/product/SkuStockLockVo.java @@ -0,0 +1,20 @@ +package com.atguigu.ssyx.vo.product; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +public class SkuStockLockVo implements Serializable { + + @ApiModelProperty(value = "skuId") + private Long skuId; + + @ApiModelProperty(value = "sku个数") + private Integer skuNum; + + @ApiModelProperty(value = "是否锁定") + private Boolean isLock = false; +} + diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/product/SkuStockVo.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/product/SkuStockVo.java new file mode 100644 index 0000000..556339c --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/product/SkuStockVo.java @@ -0,0 +1,21 @@ +package com.atguigu.ssyx.vo.product; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +public class SkuStockVo implements Serializable { + + @ApiModelProperty(value = "skuId") + private Long skuId; + + @ApiModelProperty(value = "sku类型") + private Integer skuType; + + @ApiModelProperty(value = "更新的库存数量") + private Integer stockNum; + +} + diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/product/WareQueryVo.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/product/WareQueryVo.java new file mode 100644 index 0000000..6a73550 --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/product/WareQueryVo.java @@ -0,0 +1,44 @@ +package com.atguigu.ssyx.vo.product; + +import lombok.Data; + +import java.util.Date; + +import io.swagger.annotations.ApiModelProperty; + +@Data +public class WareQueryVo { + + @ApiModelProperty(value = "名称") + private String name; + + @ApiModelProperty(value = "省code") + private String province; + + @ApiModelProperty(value = "城市code") + private String city; + + @ApiModelProperty(value = "区域code") + private String district; + + @ApiModelProperty(value = "详细地址") + private String detailAddress; + + @ApiModelProperty(value = "经度") + private String longitude; + + @ApiModelProperty(value = "纬度") + private String latitude; + + @ApiModelProperty(value = "创建时间") + private Date createTime; + + @ApiModelProperty(value = "更新时间") + private Date updateTime; + + @ApiModelProperty(value = "删除标记（0:不可用 1:可用）") + private Integer isDeleted; + + +} + diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/search/LeaderEsQueryVo.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/search/LeaderEsQueryVo.java new file mode 100644 index 0000000..f0fe7e1 --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/search/LeaderEsQueryVo.java @@ -0,0 +1,13 @@ +package com.atguigu.ssyx.vo.search; + +import lombok.Data; + +// 封装查询条件 +@Data +public class LeaderEsQueryVo { + + double latitude = 39.9504550; + double longitude = 116.3512330; + double distance = 100; + +} diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/search/SkuEsQueryVo.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/search/SkuEsQueryVo.java new file mode 100644 index 0000000..74917cd --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/search/SkuEsQueryVo.java @@ -0,0 +1,18 @@ +package com.atguigu.ssyx.vo.search; + +import lombok.Data; +import org.springframework.data.elasticsearch.annotations.Field; +import org.springframework.data.elasticsearch.annotations.FieldType; + +// 封装查询条件 +@Data +public class SkuEsQueryVo { + + private Long categoryId; + ;//三级分类id + + private String keyword;//检索的关键字 + + private Long wareId; + +} diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/sys/RegionVo.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/sys/RegionVo.java new file mode 100644 index 0000000..96cdd2f --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/sys/RegionVo.java @@ -0,0 +1,17 @@ +package com.atguigu.ssyx.vo.sys; + +import com.baomidou.mybatisplus.annotation.TableField; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class RegionVo { + + @ApiModelProperty(value = "开通区域") + private Long regionId; + + @ApiModelProperty(value = "区域名称") + private String regionName; + +} + diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/sys/RegionWareQueryVo.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/sys/RegionWareQueryVo.java new file mode 100644 index 0000000..ada5299 --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/sys/RegionWareQueryVo.java @@ -0,0 +1,16 @@ +package com.atguigu.ssyx.vo.sys; + +import lombok.Data; + +import java.util.Date; + +import io.swagger.annotations.ApiModelProperty; + +@Data +public class RegionWareQueryVo { + + @ApiModelProperty(value = "关键字") + private String keyword; + +} + diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/user/LeaderAddressVo.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/user/LeaderAddressVo.java new file mode 100644 index 0000000..cc70702 --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/user/LeaderAddressVo.java @@ -0,0 +1,59 @@ +package com.atguigu.ssyx.vo.user; + +import com.baomidou.mybatisplus.annotation.TableField; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + *

+ * UserAddress + *

+ * + * @author qy + */ +@Data +@ApiModel(description = "用户地址") +public class LeaderAddressVo { + + @ApiModelProperty(value = "用户id") + private Long userId; + + @ApiModelProperty(value = "团长id") + private Long leaderId; + + @ApiModelProperty(value = "团长名称") + private String leaderName; + + @ApiModelProperty(value = "团长电话") + private String leaderPhone; + + @ApiModelProperty(value = "仓库id") + private Long wareId; + + @ApiModelProperty(value = "提货点名称") + private String takeName; + + @ApiModelProperty(value = "省") + private String province; + + @ApiModelProperty(value = "城市") + private String city; + + @ApiModelProperty(value = "区域") + private String district; + + @ApiModelProperty(value = "详细地址") + private String detailAddress; + + @ApiModelProperty(value = "经度") + private String longitude; + + @ApiModelProperty(value = "纬度") + private String latitude; + + @ApiModelProperty(value = "门店照片") + private String storePath; + +} + diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/user/LeaderBillQueryVo.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/user/LeaderBillQueryVo.java new file mode 100644 index 0000000..85363d5 --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/user/LeaderBillQueryVo.java @@ -0,0 +1,46 @@ +package com.atguigu.ssyx.vo.user; + +import lombok.Data; + +import java.util.Date; + +import io.swagger.annotations.ApiModelProperty; + +@Data +public class LeaderBillQueryVo { + + @ApiModelProperty(value = "团长ID") + private String leaderId; + + @ApiModelProperty(value = "账单类型") + private String billType; + + @ApiModelProperty(value = "业务编号") + private String businessNo; + + @ApiModelProperty(value = "交易时间") + private Date billTime; + + @ApiModelProperty(value = "账单金额") + private String billAmount; + + @ApiModelProperty(value = "账单编号") + private String billNo; + + @ApiModelProperty(value = "账单描述") + private String billDesc; + + @ApiModelProperty(value = "交易前资金余额") + private String balanceBefore; + + @ApiModelProperty(value = "交易后资金余额") + private String balanceAfter; + + @ApiModelProperty(value = "账单状态") + private Integer billStatus; + + @ApiModelProperty(value = "创建时间") + private Date createTime; + +} + diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/user/LeaderQueryVo.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/user/LeaderQueryVo.java new file mode 100644 index 0000000..b2824b8 --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/user/LeaderQueryVo.java @@ -0,0 +1,29 @@ +package com.atguigu.ssyx.vo.user; + +import com.baomidou.mybatisplus.annotation.TableField; +import lombok.Data; + +import java.util.Date; + +import io.swagger.annotations.ApiModelProperty; + +@Data +public class LeaderQueryVo { + + @ApiModelProperty(value = "审核状态") + private Integer checkStatus; + + @ApiModelProperty(value = "关键字") + private String keyword; + + @ApiModelProperty(value = "省") + private String province; + + @ApiModelProperty(value = "城市") + private String city; + + @ApiModelProperty(value = "区域") + private String district; + +} + diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/user/LeaderVo.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/user/LeaderVo.java new file mode 100644 index 0000000..f7138a5 --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/user/LeaderVo.java @@ -0,0 +1,88 @@ +package com.atguigu.ssyx.vo.user; + +import com.baomidou.mybatisplus.annotation.TableField; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel(description = "Leader") +public class LeaderVo implements Serializable { + + private static final long serialVersionUID = 1L; + +// @ApiModelProperty(value = "用户id") +// @TableField("user_id") +// private Long userId; +// +// @ApiModelProperty(value = "区域id") +// @TableField("region_id") +// private Long regionId; + + @ApiModelProperty(value = "有无门店") + @TableField("have_store") + private Integer haveStore; + + @ApiModelProperty(value = "提货点名称") + @TableField("take_name") + private String takeName; + + @ApiModelProperty(value = "省") + @TableField("province") + private Long province; + + @ApiModelProperty(value = "城市") + @TableField("city") + private Long city; + + @ApiModelProperty(value = "区域") + @TableField("district") + private Long district; + + @ApiModelProperty(value = "详细地址") + @TableField("detail_address") + private String detailAddress; + + @ApiModelProperty(value = "提货点类型；1->宝妈；2->便利店店主；3->快递站点；4->物业中心") + @TableField("take_type") + private String takeType; + + @ApiModelProperty(value = "营业时间") + @TableField("work_time") + private String workTime; + + @ApiModelProperty(value = "名称") + @TableField("name") + private String name; + + @ApiModelProperty(value = "手机号码") + @TableField("phone") + private String phone; + + @ApiModelProperty(value = "身份证") + @TableField("id_no") + private String idNo; + + @ApiModelProperty(value = "身份证图片路径") + @TableField("id_no_url1") + private String idNoUrl1; + + @ApiModelProperty(value = "身份证图片路径") + @TableField("id_no_url2") + private String idNoUrl2; + + @ApiModelProperty(value = "经度") + @TableField("longitude") + private Double longitude; + + @ApiModelProperty(value = "纬度") + @TableField("latitude") + private Double latitude; + + @ApiModelProperty(value = "门店照片") + @TableField("store_path") + private String storePath; + +} diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/user/UserLoginVo.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/user/UserLoginVo.java new file mode 100644 index 0000000..7c4d3d6 --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/user/UserLoginVo.java @@ -0,0 +1,36 @@ +package com.atguigu.ssyx.vo.user; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel(description = "用户登录信息") +public class UserLoginVo implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "用户id") + private Long userId; + + @ApiModelProperty(value = "会员头像") + private String photoUrl; + + @ApiModelProperty(value = "昵称") + private String nickName; + + @ApiModelProperty(value = "小程序open id") + private String openId; + + @ApiModelProperty(value = "是否新用户") + private Integer isNew; + + @ApiModelProperty(value = "当前登录用户团长id") + private Long leaderId; + + @ApiModelProperty(value = "仓库id") + private Long wareId; + +} diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/user/UserQueryVo.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/user/UserQueryVo.java new file mode 100644 index 0000000..7426f73 --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/user/UserQueryVo.java @@ -0,0 +1,25 @@ +package com.atguigu.ssyx.vo.user; + +import lombok.Data; + +import java.util.Date; + +import io.swagger.annotations.ApiModelProperty; + +@Data +public class UserQueryVo { + + @ApiModelProperty(value = "昵称") + private String nickName; + + @ApiModelProperty(value = "身份证号码") + private String idNo; + + @ApiModelProperty(value = "性别") + private String sex; + + @ApiModelProperty(value = "电话号码") + private String phone; + +} + diff --git a/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/user/WeixinVo.java b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/user/WeixinVo.java new file mode 100644 index 0000000..5179b5d --- /dev/null +++ b/guigu-ssyx-parent/model/src/main/java/com/atguigu/ssyx/vo/user/WeixinVo.java @@ -0,0 +1,21 @@ +package com.atguigu.ssyx.vo.user; + +import com.baomidou.mybatisplus.annotation.TableField; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel(description = "weixinVo") +public class WeixinVo implements Serializable { + + private static final long serialVersionUID = 1L; + + private String iv; + private String encryptedData; + private String sessionKey; + private String openId; + +} diff --git a/guigu-ssyx-parent/pom.xml b/guigu-ssyx-parent/pom.xml new file mode 100644 index 0000000..bba7f75 --- /dev/null +++ b/guigu-ssyx-parent/pom.xml @@ -0,0 +1,152 @@ + + + 4.0.0 + + com.atguigu + guigu-ssyx-parent + pom + 1.0-SNAPSHOT + + common + model + service + + + + org.springframework.boot + spring-boot-starter-parent + 2.3.6.RELEASE + + + + true + 1.8 + Hoxton.SR8 + 2.2.2.RELEASE + 3.4.1 + 8.0.30 + 0.7.0 + 2.0.0 + 4.5.1 + 3.1.0 + 4.1.1 + 3.9.1 + 2.0.8 + 2.10.1 + 2.3.0 + 8 + 8 + UTF-8 + + + + + + + + org.springframework.cloud + spring-cloud-dependencies + ${cloud.version} + pom + import + + + com.alibaba.cloud + spring-cloud-alibaba-dependencies + ${alibaba.version} + pom + import + + + + com.baomidou + mybatis-plus-boot-starter + ${mybatis-plus.version} + + + mysql + mysql-connector-java + ${mysql.version} + + + com.github.xiaoymin + knife4j-spring-boot-starter + 2.0.9 + + + io.jsonwebtoken + jjwt + ${jwt.version} + + + org.apache.httpcomponents + httpclient + ${httpclient.version} + + + com.alibaba + fastjson + ${fastjson.version} + + + com.alibaba + easyexcel + ${easyexcel.version} + + + com.aliyun + aliyun-java-sdk-core + ${aliyun.version} + + + + joda-time + joda-time + ${jodatime.version} + + + com.xuxueli + xxl-job-core + ${xxl-job.version} + + + + com.baomidou + mybatis-plus-generator + 3.4.1 + + + + org.apache.velocity + velocity-engine-core + 2.0 + + + + + + nexus-aliyun + Nexus aliyun + default + https://maven.aliyun.com/repository/public + + false + + + true + + + + spring + https://maven.aliyun.com/repository/spring + + true + + + true + + + + diff --git a/guigu-ssyx-parent/service/pom.xml b/guigu-ssyx-parent/service/pom.xml new file mode 100644 index 0000000..36e72ea --- /dev/null +++ b/guigu-ssyx-parent/service/pom.xml @@ -0,0 +1,82 @@ + + + 4.0.0 + + com.atguigu + guigu-ssyx-parent + 1.0-SNAPSHOT + + + service + pom + + service-acl + service-sys + + + + + + com.atguigu + service-util + 1.0-SNAPSHOT + + + + com.atguigu + model + 1.0-SNAPSHOT + + + + + org.springframework.boot + spring-boot-starter-web + + + + + com.baomidou + mybatis-plus-boot-starter + + + + + mysql + mysql-connector-java + + + + + + + + + + + + + + + + + + + + + + + org.springframework.boot + spring-boot-devtools + true + + + + 8 + 8 + UTF-8 + + + diff --git a/guigu-ssyx-parent/service/service-acl/pom.xml b/guigu-ssyx-parent/service/service-acl/pom.xml new file mode 100644 index 0000000..02664ec --- /dev/null +++ b/guigu-ssyx-parent/service/service-acl/pom.xml @@ -0,0 +1,20 @@ + + + 4.0.0 + + com.atguigu + service + 1.0-SNAPSHOT + + + service-acl + + + 8 + 8 + UTF-8 + + + diff --git a/guigu-ssyx-parent/service/service-acl/src/main/java/com/atguigu/ssyx/ServiceAclApplication.java b/guigu-ssyx-parent/service/service-acl/src/main/java/com/atguigu/ssyx/ServiceAclApplication.java new file mode 100644 index 0000000..69d058d --- /dev/null +++ b/guigu-ssyx-parent/service/service-acl/src/main/java/com/atguigu/ssyx/ServiceAclApplication.java @@ -0,0 +1,21 @@ +package com.atguigu.ssyx; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +/** + * ClassName: ServiceAclApplication + * Package: com.atguigu.ssyx + * 权限管理模块启动类 + * + * @author yovinchen + * @Create 2023/9/13 17:38 + */ +@SpringBootApplication +public class ServiceAclApplication { + + public static void main(String[] args) { + SpringApplication.run(ServiceAclApplication.class, args); + } + +} diff --git a/guigu-ssyx-parent/service/service-acl/src/main/java/com/atguigu/ssyx/acl/controller/AdminController.java b/guigu-ssyx-parent/service/service-acl/src/main/java/com/atguigu/ssyx/acl/controller/AdminController.java new file mode 100644 index 0000000..acfb18a --- /dev/null +++ b/guigu-ssyx-parent/service/service-acl/src/main/java/com/atguigu/ssyx/acl/controller/AdminController.java @@ -0,0 +1,135 @@ +package com.atguigu.ssyx.acl.controller; + + +import com.atguigu.ssyx.acl.service.AdminService; +import com.atguigu.ssyx.acl.service.RoleService; +import com.atguigu.ssyx.common.result.Result; +import com.atguigu.ssyx.common.utils.MD5; +import com.atguigu.ssyx.model.acl.Admin; +import com.atguigu.ssyx.vo.acl.AdminQueryVo; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.Map; + +/** + * ClassName: AdminController + * Package: com.atguigu.ssyx.acl.controller + * 用户管理前端控制器 + * + * @author yovinchen + * @Create 2023/9/14 10:38 + */ +@RestController +@RequestMapping("/admin/acl/user") +@Api(tags = "用户管理") +@CrossOrigin +public class AdminController { + + @Autowired + private AdminService adminService; + + @Autowired + private RoleService roleService; + + @ApiOperation(value = "获取管理用户分页列表") + @GetMapping("{page}/{limit}") + public Result index(@ApiParam(name = "page", value = "当前页码", required = true) @PathVariable Long page, + @ApiParam(name = "limit", value = "每页记录数", required = true) @PathVariable Long limit, + @ApiParam(name = "userQueryVo", value = "查询对象", required = false) AdminQueryVo userQueryVo) { + try { + Page pageParam = new Page<>(page, limit); + IPage pageModel = adminService.selectPage(pageParam, userQueryVo); + return Result.ok(pageModel); + } catch (Exception e) { + throw new RuntimeException("获取管理用户分页列表异常", e); + } + } + + @ApiOperation(value = "获取管理用户") + @GetMapping("get/{id}") + public Result get(@PathVariable Long id) { + try { + Admin user = adminService.getById(id); + return Result.ok(user); + } catch (Exception e) { + throw new RuntimeException("获取管理用户异常", e); + } + + } + + @ApiOperation(value = "新增管理用户") + @PostMapping("save") + public Result save(@RequestBody Admin user) { + try { + //对密码进行MD5处理 + user.setPassword(MD5.encrypt(user.getPassword())); + boolean result = adminService.save(user); + return result ? Result.ok(null) : Result.fail(null); + } catch (Exception e) { + throw new RuntimeException("新增管理用户异常", e); + } + } + + @ApiOperation(value = "修改管理用户") + @PutMapping("update") + public Result updateById(@RequestBody Admin user) { + try { + boolean result = adminService.updateById(user); + return result ? Result.ok(null) : Result.fail(null); + } catch (Exception e) { + throw new RuntimeException("修改管理用户异常", e); + } + } + + @ApiOperation(value = "删除管理用户") + @DeleteMapping("remove/{id}") + public Result remove(@PathVariable Long id) { + try { + boolean result = adminService.removeById(id); + return result ? Result.ok(null) : Result.fail(null); + } catch (Exception e) { + throw new RuntimeException("删除管理用户异常", e); + } + } + + @ApiOperation(value = "根据id列表删除管理用户") + @DeleteMapping("batchRemove") + public Result batchRemove(@RequestBody List idList) { + try { + boolean result = adminService.removeByIds(idList); + return result ? Result.ok(null) : Result.fail(null); + } catch (Exception e) { + throw new RuntimeException("根据id列表删除管理用户异常", e); + } + } + + @ApiOperation(value = "根据用户获取角色数据") + @GetMapping("/toAssign/{adminId}") + public Result toAssign(@PathVariable Long adminId) { + try { + Map roleMap = roleService.findRoleByUserId(adminId); + return StringUtils.isNotEmpty(roleMap.toString()) ? Result.ok(roleMap) : Result.fail(roleMap); + } catch (Exception e) { + throw new RuntimeException("根据用户获取角色数据异常", e); + } + } + + @ApiOperation(value = "根据用户分配角色") + @PostMapping("/doAssign") + public Result doAssign(@RequestParam Long adminId, @RequestParam Long[] roleId) { + try { + roleService.saveUserRoleRealtionShip(adminId, roleId); + return Result.ok(null); + } catch (Exception e) { + throw new RuntimeException("根据用户分配角色异常", e); + } + } +} diff --git a/guigu-ssyx-parent/service/service-acl/src/main/java/com/atguigu/ssyx/acl/controller/IndexController.java b/guigu-ssyx-parent/service/service-acl/src/main/java/com/atguigu/ssyx/acl/controller/IndexController.java new file mode 100644 index 0000000..01daf24 --- /dev/null +++ b/guigu-ssyx-parent/service/service-acl/src/main/java/com/atguigu/ssyx/acl/controller/IndexController.java @@ -0,0 +1,52 @@ +package com.atguigu.ssyx.acl.controller; + +import com.atguigu.ssyx.common.result.Result; +import io.swagger.annotations.Api; +import org.springframework.web.bind.annotation.*; + +import java.util.HashMap; +import java.util.Map; + +/** + * ClassName: IndexController + * Package: com.atguigu.ssyx.acl.controller + * + * @author yovinchen + * @Create 2023/9/13 18:00 + */ + +@Api(tags = "登录接口") +@RestController +@RequestMapping("/admin/acl/index") +@CrossOrigin //跨域 +public class IndexController { + + /** + * 1、请求登陆的login + */ + @PostMapping("login") + public Result login() { + Map map = new HashMap<>(); + map.put("token", "admin-token"); + return Result.ok(map); + } + + /** + * 2 获取用户信息 + */ + @GetMapping("info") + public Result info() { + Map map = new HashMap<>(); + map.put("name", "atguigu"); + map.put("avatar", "https://wpimg.wallstcn.com/f778738c-e4f8-4870-b634-56703b4acafe.gif"); + return Result.ok(map); + } + + /** + * 3 退出 + */ + @PostMapping("logout") + public Result logout() { + return Result.ok(null); + } +} diff --git a/guigu-ssyx-parent/service/service-acl/src/main/java/com/atguigu/ssyx/acl/controller/PermissionController.java b/guigu-ssyx-parent/service/service-acl/src/main/java/com/atguigu/ssyx/acl/controller/PermissionController.java new file mode 100644 index 0000000..02396ab --- /dev/null +++ b/guigu-ssyx-parent/service/service-acl/src/main/java/com/atguigu/ssyx/acl/controller/PermissionController.java @@ -0,0 +1,74 @@ +package com.atguigu.ssyx.acl.controller; + +import com.atguigu.ssyx.acl.service.PermissionService; +import com.atguigu.ssyx.common.result.Result; +import com.atguigu.ssyx.model.acl.Permission; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * ClassName: PermissionController + * Package: com.atguigu.ssyx.acl.controller + * 菜单服务 + * + * @author yovinchen + * @Create 2023/9/14 14:03 + */ +@RestController +@RequestMapping("/admin/acl/permission") +@Api(tags = "菜单服务") +@CrossOrigin +public class PermissionController { + + @Autowired + private PermissionService permissionService; + + @ApiOperation(value = "获取菜单") + @GetMapping + public Result index() { + try { + List list = permissionService.queryAllMenu(); + return StringUtils.isNotEmpty(list.toString()) ? Result.ok(list) : Result.fail(list); + } catch (Exception e) { + throw new RuntimeException("获取菜单异常", e); + } + } + + @ApiOperation(value = "新增菜单") + @PostMapping("save") + public Result save(@RequestBody Permission permission) { + try { + boolean result = permissionService.save(permission); + return result ? Result.ok(null) : Result.fail(null); + } catch (Exception e) { + throw new RuntimeException("新增菜单异常", e); + } + } + + @ApiOperation(value = "修改菜单") + @PutMapping("update") + public Result updateById(@RequestBody Permission permission) { + try { + boolean result = permissionService.updateById(permission); + return result ? Result.ok(null) : Result.fail(null); + } catch (Exception e) { + throw new RuntimeException("修改菜单异常", e); + } + } + + @ApiOperation(value = "递归删除菜单") + @DeleteMapping("remove/{id}") + public Result remove(@PathVariable Long id) { + try { + boolean result = permissionService.removeChildById(id); + return result ? Result.ok(null) : Result.fail(null); + } catch (Exception e) { + throw new RuntimeException("递归删除菜单异常", e); + } + } +} diff --git a/guigu-ssyx-parent/service/service-acl/src/main/java/com/atguigu/ssyx/acl/controller/RoleController.java b/guigu-ssyx-parent/service/service-acl/src/main/java/com/atguigu/ssyx/acl/controller/RoleController.java new file mode 100644 index 0000000..7bdf2ce --- /dev/null +++ b/guigu-ssyx-parent/service/service-acl/src/main/java/com/atguigu/ssyx/acl/controller/RoleController.java @@ -0,0 +1,128 @@ +package com.atguigu.ssyx.acl.controller; + +import com.atguigu.ssyx.acl.service.PermissionService; +import com.atguigu.ssyx.acl.service.RoleService; +import com.atguigu.ssyx.common.result.Result; +import com.atguigu.ssyx.model.acl.Role; +import com.atguigu.ssyx.vo.acl.RoleQueryVo; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.Map; + +/** + * ClassName: RoleController + * Package: com.atguigu.ssyx.acl.controller + * 角色管理前端控制器 + * + * @author yovinchen + * @Create 2023/9/14 09:09 + */ +@RestController +@RequestMapping("/admin/acl/role") +@Api(tags = "角色管理") +@CrossOrigin +@Slf4j +public class RoleController { + + @Autowired + private RoleService roleService; + @Autowired + private PermissionService permissionService; + + @ApiOperation(value = "获取角色分页列表") + @GetMapping("{page}/{limit}") + public Result index(@ApiParam(name = "page", value = "当前页码", required = true) + @PathVariable Long page, @ApiParam(name = "limit", value = "每页记录数", required = true) + @PathVariable Long limit, @ApiParam(name = "roleQueryVo", value = "查询对象", required = false) + RoleQueryVo roleQueryVo) { + try { + Page pageParam = new Page<>(page, limit); + IPage pageModel = roleService.selectPage(pageParam, roleQueryVo); + return Result.ok(pageModel); + } catch (Exception e) { + // 处理异常，例如记录日志或者抛出自定义异常 + throw new RuntimeException("获取角色分页列表异常", e); + } + } + + @ApiOperation(value = "获取角色") + @GetMapping("get/{id}") + public Result get(@PathVariable Long id) { + try { + Role role = roleService.getById(id); + return Result.ok(role); + } catch (Exception e) { + throw new RuntimeException("获取角色异常", e); + } + } + + @ApiOperation(value = "新增角色") + @PostMapping("save") + public Result save(@RequestBody Role role) { + try { + boolean result = roleService.save(role); + return result ? Result.ok(null) : Result.fail(null); + } catch (Exception e) { + // 处理异常，例如记录日志或者抛出自定义异常 + throw new RuntimeException("新增角色异常" + role.toString(), e); + } + } + + @ApiOperation(value = "修改角色") + @PutMapping("update") + public Result updateById(@RequestBody Role role) { + try { + boolean result = roleService.updateById(role); + return result ? Result.ok(null) : Result.fail(null); + } catch (Exception e) { + // 处理异常，例如记录日志或者抛出自定义异常 + throw new RuntimeException("修改角色异常" + role.toString(), e); + } + } + + @ApiOperation(value = "删除角色") + @DeleteMapping("remove/{id}") + public Result remove(@PathVariable Long id) { + try { + boolean result = roleService.removeById(id); + return result ? Result.ok(null) : Result.fail(null); + } catch (Exception e) { + // 处理异常，例如记录日志或者抛出自定义异常 + throw new RuntimeException("删除角色异常", e); + } + } + + @ApiOperation(value = "根据id列表删除角色") + @DeleteMapping("batchRemove") + public Result batchRemove(@RequestBody List idList) { + // TODO + try { + boolean result = roleService.removeByIds(idList); + return result ? Result.ok(null) : Result.fail(null); + } catch (Exception e) { + // 处理异常，例如记录日志或者抛出自定义异常 + throw new RuntimeException("根据id列表删除角色异常", e); + } + } + + @ApiOperation(value = "获取一个角色的所有权限列表") + @GetMapping("toAssign/{id}") + public Result toAssign(@PathVariable Long id) { +// TODO + try { + Map result = permissionService.getPermissionById(id); + return Result.ok(result); + } catch (Exception e) { + // 处理异常，例如记录日志或者抛出自定义异常 + throw new RuntimeException("获取一个角色的所有权限列表异常", e); + } + } +} diff --git a/guigu-ssyx-parent/service/service-acl/src/main/java/com/atguigu/ssyx/acl/mapper/AdminMapper.java b/guigu-ssyx-parent/service/service-acl/src/main/java/com/atguigu/ssyx/acl/mapper/AdminMapper.java new file mode 100644 index 0000000..ba8b43b --- /dev/null +++ b/guigu-ssyx-parent/service/service-acl/src/main/java/com/atguigu/ssyx/acl/mapper/AdminMapper.java @@ -0,0 +1,18 @@ +package com.atguigu.ssyx.acl.mapper; + +import com.atguigu.ssyx.model.acl.Admin; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.springframework.stereotype.Repository; + +/** + * ClassName: AdminMapper + * Package: com.atguigu.ssyx.acl.mapper + * 用户管理 + * + * @author yovinchen + * @Create 2023/9/14 10:45 + */ +@Repository +public interface AdminMapper extends BaseMapper { + +} diff --git a/guigu-ssyx-parent/service/service-acl/src/main/java/com/atguigu/ssyx/acl/mapper/AdminRoleMapper.java b/guigu-ssyx-parent/service/service-acl/src/main/java/com/atguigu/ssyx/acl/mapper/AdminRoleMapper.java new file mode 100644 index 0000000..6399900 --- /dev/null +++ b/guigu-ssyx-parent/service/service-acl/src/main/java/com/atguigu/ssyx/acl/mapper/AdminRoleMapper.java @@ -0,0 +1,16 @@ +package com.atguigu.ssyx.acl.mapper; + +import com.atguigu.ssyx.model.acl.AdminRole; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.springframework.stereotype.Repository; + +/** + * ClassName: AdminRoleMapper + * Package: com.atguigu.ssyx.acl.mapper + * + * @author yovinchen + * @Create 2023/9/14 11:15 + */ +@Repository +public interface AdminRoleMapper extends BaseMapper { +} diff --git a/guigu-ssyx-parent/service/service-acl/src/main/java/com/atguigu/ssyx/acl/mapper/PermissionMapper.java b/guigu-ssyx-parent/service/service-acl/src/main/java/com/atguigu/ssyx/acl/mapper/PermissionMapper.java new file mode 100644 index 0000000..1b2038e --- /dev/null +++ b/guigu-ssyx-parent/service/service-acl/src/main/java/com/atguigu/ssyx/acl/mapper/PermissionMapper.java @@ -0,0 +1,18 @@ +package com.atguigu.ssyx.acl.mapper; + +import com.atguigu.ssyx.model.acl.Permission; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.springframework.stereotype.Repository; + +/** + * ClassName: PermissionMapper + * Package: com.atguigu.ssyx.acl.mapper + * 菜单Mapper接口 + * + * @author yovinchen + * @Create 2023/9/14 13:59 + */ +@Repository +public interface PermissionMapper extends BaseMapper { + +} diff --git a/guigu-ssyx-parent/service/service-acl/src/main/java/com/atguigu/ssyx/acl/mapper/RoleMapper.java b/guigu-ssyx-parent/service/service-acl/src/main/java/com/atguigu/ssyx/acl/mapper/RoleMapper.java new file mode 100644 index 0000000..68eb04b --- /dev/null +++ b/guigu-ssyx-parent/service/service-acl/src/main/java/com/atguigu/ssyx/acl/mapper/RoleMapper.java @@ -0,0 +1,18 @@ +package com.atguigu.ssyx.acl.mapper; + +import com.atguigu.ssyx.model.acl.Role; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.springframework.stereotype.Repository; + +/** + * ClassName: RoleMapper + * Package: com.atguigu.ssyx.acl.mapper + * 角色管理 + * + * @author yovinchen + * @Create 2023/9/14 09:11 + */ +@Repository +public interface RoleMapper extends BaseMapper { + +} diff --git a/guigu-ssyx-parent/service/service-acl/src/main/java/com/atguigu/ssyx/acl/mapper/RolePermissionMapper.java b/guigu-ssyx-parent/service/service-acl/src/main/java/com/atguigu/ssyx/acl/mapper/RolePermissionMapper.java new file mode 100644 index 0000000..d8cb9c8 --- /dev/null +++ b/guigu-ssyx-parent/service/service-acl/src/main/java/com/atguigu/ssyx/acl/mapper/RolePermissionMapper.java @@ -0,0 +1,14 @@ +package com.atguigu.ssyx.acl.mapper; + +import com.atguigu.ssyx.model.acl.RolePermission; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * ClassName: RolePermissionMapper + * Package: com.atguigu.ssyx.acl.mapper + * + * @author yovinchen + * @Create 2023/9/14 15:07 + */ +public interface RolePermissionMapper extends BaseMapper { +} diff --git a/guigu-ssyx-parent/service/service-acl/src/main/java/com/atguigu/ssyx/acl/service/AdminRoleService.java b/guigu-ssyx-parent/service/service-acl/src/main/java/com/atguigu/ssyx/acl/service/AdminRoleService.java new file mode 100644 index 0000000..c2e3bb1 --- /dev/null +++ b/guigu-ssyx-parent/service/service-acl/src/main/java/com/atguigu/ssyx/acl/service/AdminRoleService.java @@ -0,0 +1,14 @@ +package com.atguigu.ssyx.acl.service; + +import com.atguigu.ssyx.model.acl.AdminRole; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * ClassName: AdminRoleService + * Package: com.atguigu.ssyx.acl.service + * + * @author yovinchen + * @Create 2023/9/14 11:15 + */ +public interface AdminRoleService extends IService { +} diff --git a/guigu-ssyx-parent/service/service-acl/src/main/java/com/atguigu/ssyx/acl/service/AdminService.java b/guigu-ssyx-parent/service/service-acl/src/main/java/com/atguigu/ssyx/acl/service/AdminService.java new file mode 100644 index 0000000..6e56bc7 --- /dev/null +++ b/guigu-ssyx-parent/service/service-acl/src/main/java/com/atguigu/ssyx/acl/service/AdminService.java @@ -0,0 +1,28 @@ +package com.atguigu.ssyx.acl.service; + +import com.atguigu.ssyx.model.acl.Admin; +import com.atguigu.ssyx.vo.acl.AdminQueryVo; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * ClassName: AdminService + * Package: com.atguigu.ssyx.acl.service + * 用户管理 + * + * @author yovinchen + * @Create 2023/9/14 10:44 + */ +public interface AdminService extends IService { + + /** + * 用户分页列表 + * + * @param pageParam + * @param userQueryVo + * @return + */ + IPage selectPage(Page pageParam, AdminQueryVo userQueryVo); + +} diff --git a/guigu-ssyx-parent/service/service-acl/src/main/java/com/atguigu/ssyx/acl/service/PermissionService.java b/guigu-ssyx-parent/service/service-acl/src/main/java/com/atguigu/ssyx/acl/service/PermissionService.java new file mode 100644 index 0000000..a6499c2 --- /dev/null +++ b/guigu-ssyx-parent/service/service-acl/src/main/java/com/atguigu/ssyx/acl/service/PermissionService.java @@ -0,0 +1,26 @@ +package com.atguigu.ssyx.acl.service; + +import com.atguigu.ssyx.model.acl.Permission; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; +import java.util.Map; + +/** + * ClassName: PermissionService + * Package: com.atguigu.ssyx.acl.service + * 权限服务 + * + * @author yovinchen + * @Create 2023/9/14 14:01 + */ +public interface PermissionService extends IService { + + //获取所有菜单列表 + List queryAllMenu(); + + //递归删除 + boolean removeChildById(Long id); + + Map getPermissionById(Long id); +} diff --git a/guigu-ssyx-parent/service/service-acl/src/main/java/com/atguigu/ssyx/acl/service/RoleService.java b/guigu-ssyx-parent/service/service-acl/src/main/java/com/atguigu/ssyx/acl/service/RoleService.java new file mode 100644 index 0000000..bddf909 --- /dev/null +++ b/guigu-ssyx-parent/service/service-acl/src/main/java/com/atguigu/ssyx/acl/service/RoleService.java @@ -0,0 +1,28 @@ +package com.atguigu.ssyx.acl.service; + +import com.atguigu.ssyx.model.acl.Role; +import com.atguigu.ssyx.vo.acl.RoleQueryVo; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.Map; + +/** + * ClassName: RoleService + * Package: com.atguigu.ssyx.acl.service + * 用户管理 + * + * @author yovinchen + * @Create 2023/9/14 09:10 + */ +public interface RoleService extends IService { + + //角色分页列表 + IPage selectPage(Page pageParam, RoleQueryVo roleQueryVo); + + Map findRoleByUserId(Long adminId); + + void saveUserRoleRealtionShip(Long adminId, Long[] roleId); + +} diff --git a/guigu-ssyx-parent/service/service-acl/src/main/java/com/atguigu/ssyx/acl/service/impl/AdminRoleServiceImpl.java b/guigu-ssyx-parent/service/service-acl/src/main/java/com/atguigu/ssyx/acl/service/impl/AdminRoleServiceImpl.java new file mode 100644 index 0000000..843a295 --- /dev/null +++ b/guigu-ssyx-parent/service/service-acl/src/main/java/com/atguigu/ssyx/acl/service/impl/AdminRoleServiceImpl.java @@ -0,0 +1,20 @@ +package com.atguigu.ssyx.acl.service.impl; + +import com.atguigu.ssyx.acl.mapper.AdminRoleMapper; +import com.atguigu.ssyx.acl.service.AdminRoleService; +import com.atguigu.ssyx.model.acl.AdminRole; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + * ClassName: AdminRoleServiceImpl + * Package: com.atguigu.ssyx.acl.service.impl + * + * @author yovinchen + * @Create 2023/9/14 11:15 + */ +@Service +public class AdminRoleServiceImpl extends ServiceImpl + implements AdminRoleService { + +} diff --git a/guigu-ssyx-parent/service/service-acl/src/main/java/com/atguigu/ssyx/acl/service/impl/AdminServiceImpl.java b/guigu-ssyx-parent/service/service-acl/src/main/java/com/atguigu/ssyx/acl/service/impl/AdminServiceImpl.java new file mode 100644 index 0000000..99ffaf7 --- /dev/null +++ b/guigu-ssyx-parent/service/service-acl/src/main/java/com/atguigu/ssyx/acl/service/impl/AdminServiceImpl.java @@ -0,0 +1,47 @@ +package com.atguigu.ssyx.acl.service.impl; + +import com.atguigu.ssyx.acl.mapper.AdminMapper; +import com.atguigu.ssyx.acl.service.AdminService; +import com.atguigu.ssyx.acl.service.RoleService; +import com.atguigu.ssyx.model.acl.Admin; +import com.atguigu.ssyx.vo.acl.AdminQueryVo; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.util.StringUtils; + +/** + * ClassName: AdminServiceImpl + * Package: com.atguigu.ssyx.acl.service.impl + * 用户管理 + * + * @author yovinchen + * @Create 2023/9/14 10:44 + */ +@Service +public class AdminServiceImpl extends ServiceImpl implements AdminService { + + @Autowired + private AdminMapper userMapper; + + @Autowired + private RoleService roleService; + + @Override + public IPage selectPage(Page pageParam, AdminQueryVo userQueryVo) { + //获取用户名称条件值 + String name = userQueryVo.getName(); + //创建条件构造器 + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + if (!StringUtils.isEmpty(name)) { + //封装条件 + wrapper.like(Admin::getName, name); + } + //调用mapper方法 + IPage pageModel = baseMapper.selectPage(pageParam, wrapper); + return pageModel; + } +} diff --git a/guigu-ssyx-parent/service/service-acl/src/main/java/com/atguigu/ssyx/acl/service/impl/PermissionServiceImpl.java b/guigu-ssyx-parent/service/service-acl/src/main/java/com/atguigu/ssyx/acl/service/impl/PermissionServiceImpl.java new file mode 100644 index 0000000..09195c3 --- /dev/null +++ b/guigu-ssyx-parent/service/service-acl/src/main/java/com/atguigu/ssyx/acl/service/impl/PermissionServiceImpl.java @@ -0,0 +1,78 @@ +package com.atguigu.ssyx.acl.service.impl; + +import com.atguigu.ssyx.acl.mapper.PermissionMapper; +import com.atguigu.ssyx.acl.service.PermissionService; +import com.atguigu.ssyx.acl.utils.PermissionHelper; +import com.atguigu.ssyx.model.acl.Permission; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +/** + * ClassName: PermissionServiceImpl + * Package: com.atguigu.ssyx.acl.service.impl + * + * @author yovinchen + * @Create 2023/9/14 14:02 + */ +@Service +public class PermissionServiceImpl extends ServiceImpl implements PermissionService { + + + /** + * 获取所有菜单 + * + * @return + */ + @Override + public List queryAllMenu() { + //获取全部权限数据 + List allPermissionList = baseMapper.selectList(new QueryWrapper().orderByAsc("CAST(id AS SIGNED)")); + + //把权限数据构建成树形结构数据 + return PermissionHelper.bulid(allPermissionList); + } + + /** + * 递归删除菜单 + * + * @param id + * @return + */ + @Override + public boolean removeChildById(Long id) { + List idList = new ArrayList<>(); + this.selectChildListById(id, idList); + idList.add(id); + baseMapper.deleteBatchIds(idList); + return true; + } + + @Override + public Map getPermissionById(Long id) { + return null; + } + + /** + * 递归获取子节点 + * + * @param id + * @param idList + */ + private void selectChildListById(Long id, List idList) { + List childList = baseMapper.selectList(new QueryWrapper() + .eq("pid", id) + .select("id")); + childList.forEach(item -> { + idList.add(item.getId()); + this.selectChildListById(item.getId(), idList); + }); + } + +} + + diff --git a/guigu-ssyx-parent/service/service-acl/src/main/java/com/atguigu/ssyx/acl/service/impl/RoleServiceImpl.java b/guigu-ssyx-parent/service/service-acl/src/main/java/com/atguigu/ssyx/acl/service/impl/RoleServiceImpl.java new file mode 100644 index 0000000..c594a45 --- /dev/null +++ b/guigu-ssyx-parent/service/service-acl/src/main/java/com/atguigu/ssyx/acl/service/impl/RoleServiceImpl.java @@ -0,0 +1,114 @@ +package com.atguigu.ssyx.acl.service.impl; + +import com.atguigu.ssyx.acl.mapper.RoleMapper; +import com.atguigu.ssyx.acl.service.AdminRoleService; +import com.atguigu.ssyx.acl.service.RoleService; +import com.atguigu.ssyx.model.acl.AdminRole; +import com.atguigu.ssyx.model.acl.Role; +import com.atguigu.ssyx.vo.acl.RoleQueryVo; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.StringUtils; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * ClassName: RoleServiceImpl + * Package: com.atguigu.ssyx.acl.service.impl + * 角色管理 + * + * @author yovinchen + * @Create 2023/9/14 09:11 + */ +@Service +public class RoleServiceImpl extends ServiceImpl implements RoleService { + + @Autowired + private AdminRoleService adminRoleService; + + //角色分页列表 + @Override + public IPage selectPage(Page pageParam, RoleQueryVo roleQueryVo) { + //获取条件值：角色名称 + String roleName = roleQueryVo.getRoleName(); + //创建条件构造器对象 + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + //判断条件值是否为空 + if (!StringUtils.isEmpty(roleName)) { + //封装条件 + wrapper.like(Role::getRoleName, roleName); + } + //调用mapper方法实现条件分页查询 + IPage pageModel = baseMapper.selectPage(pageParam, wrapper); + return pageModel; + } + + /** + * 分配角色 + * + * @param adminId + * @param roleIds + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void saveUserRoleRealtionShip(Long adminId, Long[] roleIds) { + //删除用户分配的角色数据 + adminRoleService.remove(new QueryWrapper().eq("admin_id", adminId)); + + //分配新的角色 + List userRoleList = new ArrayList<>(); + for (Long roleId : roleIds) { + if (StringUtils.isEmpty(roleId)) continue; + AdminRole userRole = new AdminRole(); + userRole.setAdminId(adminId); + userRole.setRoleId(roleId); + userRoleList.add(userRole); + } + adminRoleService.saveBatch(userRoleList); + } + + /** + * 根据用户获取角色数据 + * + * @param adminId + * @return + */ + @Override + public Map findRoleByUserId(Long adminId) { + //查询所有的角色 + List allRolesList = baseMapper.selectList(null); + + //拥有的角色id + List existUserRoleList = adminRoleService.list(new QueryWrapper() + .eq("admin_id", adminId) + .select("role_id")); + List existRoleList = existUserRoleList + .stream() + .map(AdminRole::getRoleId) + .collect(Collectors.toList()); + + //对角色进行分类 + List assignRoles = new ArrayList(); + for (Role role : allRolesList) { + //已分配 + if (existRoleList.contains(role.getId())) { + assignRoles.add(role); + } + } + + Map roleMap = new HashMap<>(); + roleMap.put("assignRoles", assignRoles); + roleMap.put("allRolesList", allRolesList); + return roleMap; + } +} diff --git a/guigu-ssyx-parent/service/service-acl/src/main/java/com/atguigu/ssyx/acl/utils/PermissionHelper.java b/guigu-ssyx-parent/service/service-acl/src/main/java/com/atguigu/ssyx/acl/utils/PermissionHelper.java new file mode 100644 index 0000000..738d799 --- /dev/null +++ b/guigu-ssyx-parent/service/service-acl/src/main/java/com/atguigu/ssyx/acl/utils/PermissionHelper.java @@ -0,0 +1,62 @@ +package com.atguigu.ssyx.acl.utils; + +import com.atguigu.ssyx.model.acl.Permission; + +import java.util.ArrayList; +import java.util.List; + +/** + * ClassName: PermissionHelper + * Package: com.atguigu.ssyx.acl.utils + * + * @author yovinchen + * @Create 2023/9/14 14:23 + */ +public class PermissionHelper { + + /** + * 使用递归方法建菜单 + * + * @param treeNodes + * @return + */ + public static List bulid(List treeNodes) { + List trees = new ArrayList<>(); + for (Permission treeNode : treeNodes) { + if (treeNode.getPid() == 0) { + treeNode.setLevel(1); + trees.add(findChildren(treeNode, treeNodes)); + } + } + return trees; + } + + /** + * 递归查找子节点 + * + * @param treeNodes + * @return + */ + public static Permission findChildren(Permission treeNode, List treeNodes) { + treeNode.setChildren(new ArrayList()); + + for (Permission it : treeNodes) { + if (treeNode + .getId() + .longValue() == it + .getPid() + .longValue()) { + int level = treeNode.getLevel() + 1; + it.setLevel(level); + if (treeNode.getChildren() == null) { + treeNode.setChildren(new ArrayList<>()); + } + treeNode + .getChildren() + .add(findChildren(it, treeNodes)); + } + } + return treeNode; + } +} + diff --git a/guigu-ssyx-parent/service/service-acl/src/main/resources/application-dev.yml b/guigu-ssyx-parent/service/service-acl/src/main/resources/application-dev.yml new file mode 100644 index 0000000..b89e81d --- /dev/null +++ b/guigu-ssyx-parent/service/service-acl/src/main/resources/application-dev.yml @@ -0,0 +1,18 @@ +server: + port: 8201 + +mybatis-plus: + configuration: + log-impl: org.apache.ibatis.logging.stdout.StdOutImpl + +spring: + datasource: + type: com.zaxxer.hikari.HikariDataSource + driver-class-name: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://82.157.68.223:3306/shequ-acl?characterEncoding=utf-8&useSSL=false + username: shequ-acl + password: shequ-acl + + jackson: + date-format: yyyy-MM-dd HH:mm:ss + time-zone: GMT+8 diff --git a/guigu-ssyx-parent/service/service-acl/src/main/resources/application.yml b/guigu-ssyx-parent/service/service-acl/src/main/resources/application.yml new file mode 100644 index 0000000..9ad0bdd --- /dev/null +++ b/guigu-ssyx-parent/service/service-acl/src/main/resources/application.yml @@ -0,0 +1,5 @@ +spring: + application: + name: service-acl + profiles: + active: dev diff --git a/guigu-ssyx-parent/service/service-sys/pom.xml b/guigu-ssyx-parent/service/service-sys/pom.xml new file mode 100644 index 0000000..521f650 --- /dev/null +++ b/guigu-ssyx-parent/service/service-sys/pom.xml @@ -0,0 +1,20 @@ + + + 4.0.0 + + com.atguigu + service + 1.0-SNAPSHOT + + + service-sys + + + 8 + 8 + UTF-8 + + + diff --git a/guigu-ssyx-parent/service/service-sys/src/main/java/com/atguigu/ssyx/sys/ServiceSysApplication.java b/guigu-ssyx-parent/service/service-sys/src/main/java/com/atguigu/ssyx/sys/ServiceSysApplication.java new file mode 100644 index 0000000..d2a3502 --- /dev/null +++ b/guigu-ssyx-parent/service/service-sys/src/main/java/com/atguigu/ssyx/sys/ServiceSysApplication.java @@ -0,0 +1,23 @@ +package com.atguigu.ssyx.sys; + +import org.mybatis.spring.annotation.MapperScan; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import springfox.documentation.swagger2.annotations.EnableSwagger2WebMvc; + +/** + * ClassName: ServiceSysApplication + * Package: com.atguigu.ssyx.sys + * + * @author yovinchen + * @Create 2023/9/14 15:36 + */ +@SpringBootApplication +@EnableSwagger2WebMvc +@MapperScan(value = "com.atguigu.ssyx.*.mapper") +public class ServiceSysApplication { + public static void main(String[] args) { + SpringApplication.run(ServiceSysApplication.class, args); + } + +} diff --git a/guigu-ssyx-parent/service/service-sys/src/main/java/com/atguigu/ssyx/sys/controller/RegionController.java b/guigu-ssyx-parent/service/service-sys/src/main/java/com/atguigu/ssyx/sys/controller/RegionController.java new file mode 100644 index 0000000..0b1bda1 --- /dev/null +++ b/guigu-ssyx-parent/service/service-sys/src/main/java/com/atguigu/ssyx/sys/controller/RegionController.java @@ -0,0 +1,45 @@ +package com.atguigu.ssyx.sys.controller; + + +import com.atguigu.ssyx.common.result.Result; +import com.atguigu.ssyx.model.sys.Region; +import com.atguigu.ssyx.sys.service.RegionService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + *

+ * 地区表前端控制器 + *

+ * + * @author atguigu + * @since 2023-09-14 + */ +@Api(value = "地区接口", tags = "地区接口") +@RestController +@RequestMapping("/admin/sys/region") +//@CrossOrigin +public class RegionController { + + @Autowired + private RegionService regionService; + + @ApiOperation("根据区域关键字查询区域列表信息") + @GetMapping("findRegionByKeyword/{keyword}") + public Result findRegionByKeyword(@PathVariable("keyword") String keyword) { + try { + List list = regionService.getRegionByKeyword(keyword); + return Result.ok(list); + } catch (Exception e) { + throw new RuntimeException("根据区域关键字查询区域列表信息异常", e); + } + } +} + diff --git a/guigu-ssyx-parent/service/service-sys/src/main/java/com/atguigu/ssyx/sys/controller/RegionWareController.java b/guigu-ssyx-parent/service/service-sys/src/main/java/com/atguigu/ssyx/sys/controller/RegionWareController.java new file mode 100644 index 0000000..9fda9b9 --- /dev/null +++ b/guigu-ssyx-parent/service/service-sys/src/main/java/com/atguigu/ssyx/sys/controller/RegionWareController.java @@ -0,0 +1,85 @@ +package com.atguigu.ssyx.sys.controller; + + +import com.atguigu.ssyx.common.result.Result; +import com.atguigu.ssyx.model.sys.RegionWare; +import com.atguigu.ssyx.sys.service.RegionWareService; +import com.atguigu.ssyx.vo.sys.RegionWareQueryVo; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; + +/** + *

+ * 城市仓库关联表前端控制器 + *

+ * + * @author atguigu + * @since 2023-09-14 + */ +@Api(value = "开通区域接口", tags = "开通区域接口") +@RestController +@RequestMapping(value = "/admin/sys/regionWare") +@CrossOrigin +public class RegionWareController { + @Resource + private RegionWareService regionWareService; + + @ApiOperation(value = "获取开通区域列表") + @GetMapping("{page}/{limit}") + public Result index( + @ApiParam(name = "page", value = "当前页码", required = true) + @PathVariable Long page, + @ApiParam(name = "limit", value = "每页记录数", required = true) + @PathVariable Long limit, + @ApiParam(name = "regionWareVo", value = "查询对象", required = false) + RegionWareQueryVo regionWareQueryVo) { + try { + Page pageParam = new Page<>(page, limit); + IPage pageModel = regionWareService.selectPage(pageParam, regionWareQueryVo); + return Result.ok(pageModel); + } catch (Exception e) { + throw new RuntimeException("获取开通区域列表异常", e); + } + + } + + @ApiOperation(value = "新增开通区域") + @PostMapping("save") + public Result save(@RequestBody RegionWare regionWare) { + try { + regionWareService.saveRegionWare(regionWare); + return Result.ok(null); + } catch (Exception e) { + throw new RuntimeException("新增开通区域异常", e); + } + } + + @ApiOperation(value = "删除开通区域") + @DeleteMapping("remove/{id}") + public Result remove(@PathVariable Long id) { + try { + boolean result = regionWareService.removeById(id); + return result ? Result.ok(null) : Result.fail(null); + } catch (Exception e) { + throw new RuntimeException("删除开通区域异常", e); + } + } + + @ApiOperation(value = "取消开通区域") + @PostMapping("updateStatus/{id}/{status}") + public Result updateStatus(@PathVariable Long id, @PathVariable Integer status) { + try { + regionWareService.updateStatus(id, status); + return Result.ok(null); + } catch (Exception e) { + throw new RuntimeException("删除开通区域异常", e); + } + } +} + diff --git a/guigu-ssyx-parent/service/service-sys/src/main/java/com/atguigu/ssyx/sys/controller/WareController.java b/guigu-ssyx-parent/service/service-sys/src/main/java/com/atguigu/ssyx/sys/controller/WareController.java new file mode 100644 index 0000000..c4c9b49 --- /dev/null +++ b/guigu-ssyx-parent/service/service-sys/src/main/java/com/atguigu/ssyx/sys/controller/WareController.java @@ -0,0 +1,45 @@ +package com.atguigu.ssyx.sys.controller; + + +import com.atguigu.ssyx.common.result.Result; +import com.atguigu.ssyx.model.sys.Ware; +import com.atguigu.ssyx.sys.service.WareService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.CrossOrigin; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + *

+ * 仓库表前端控制器 + *

+ * + * @author yovinchen + * @since 2023-09-14 + */ +@Api(value = "仓库接口", tags = "仓库接口") +@RestController +@RequestMapping("/admin/sys/ware") +@CrossOrigin +public class WareController { + + @Autowired + private WareService wareService; + + @ApiOperation("查询所有仓库列表") + @GetMapping("findAllList") + public Result findAllList() { + try { + List list = wareService.list(); + return Result.ok(list); + } catch (Exception e) { + throw new RuntimeException("查询所有仓库列表异常", e); + } + } +} + diff --git a/guigu-ssyx-parent/service/service-sys/src/main/java/com/atguigu/ssyx/sys/mapper/RegionMapper.java b/guigu-ssyx-parent/service/service-sys/src/main/java/com/atguigu/ssyx/sys/mapper/RegionMapper.java new file mode 100644 index 0000000..3284229 --- /dev/null +++ b/guigu-ssyx-parent/service/service-sys/src/main/java/com/atguigu/ssyx/sys/mapper/RegionMapper.java @@ -0,0 +1,18 @@ +package com.atguigu.ssyx.sys.mapper; + +import com.atguigu.ssyx.model.sys.Region; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.mapstruct.Mapper; + +/** + *

+ * 地区表 Mapper 接口 + *

+ * + * @author atguigu + * @since 2023-09-14 + */ +@Mapper +public interface RegionMapper extends BaseMapper { + +} diff --git a/guigu-ssyx-parent/service/service-sys/src/main/java/com/atguigu/ssyx/sys/mapper/RegionWareMapper.java b/guigu-ssyx-parent/service/service-sys/src/main/java/com/atguigu/ssyx/sys/mapper/RegionWareMapper.java new file mode 100644 index 0000000..ca42e97 --- /dev/null +++ b/guigu-ssyx-parent/service/service-sys/src/main/java/com/atguigu/ssyx/sys/mapper/RegionWareMapper.java @@ -0,0 +1,18 @@ +package com.atguigu.ssyx.sys.mapper; + +import com.atguigu.ssyx.model.sys.RegionWare; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.mapstruct.Mapper; + +/** + *

+ * 城市仓库关联表 Mapper 接口 + *

+ * + * @author atguigu + * @since 2023-09-14 + */ +@Mapper +public interface RegionWareMapper extends BaseMapper { + +} diff --git a/guigu-ssyx-parent/service/service-sys/src/main/java/com/atguigu/ssyx/sys/mapper/WareMapper.java b/guigu-ssyx-parent/service/service-sys/src/main/java/com/atguigu/ssyx/sys/mapper/WareMapper.java new file mode 100644 index 0000000..d507d3b --- /dev/null +++ b/guigu-ssyx-parent/service/service-sys/src/main/java/com/atguigu/ssyx/sys/mapper/WareMapper.java @@ -0,0 +1,19 @@ +package com.atguigu.ssyx.sys.mapper; + + +import com.atguigu.ssyx.model.sys.Ware; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.mapstruct.Mapper; + +/** + *

+ * 仓库表 Mapper 接口 + *

+ * + * @author atguigu + * @since 2023-09-14 + */ +@Mapper +public interface WareMapper extends BaseMapper { + +} diff --git a/guigu-ssyx-parent/service/service-sys/src/main/java/com/atguigu/ssyx/sys/mapper/xml/RegionMapper.xml b/guigu-ssyx-parent/service/service-sys/src/main/java/com/atguigu/ssyx/sys/mapper/xml/RegionMapper.xml new file mode 100644 index 0000000..639a34d --- /dev/null +++ b/guigu-ssyx-parent/service/service-sys/src/main/java/com/atguigu/ssyx/sys/mapper/xml/RegionMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/guigu-ssyx-parent/service/service-sys/src/main/java/com/atguigu/ssyx/sys/mapper/xml/RegionWareMapper.xml b/guigu-ssyx-parent/service/service-sys/src/main/java/com/atguigu/ssyx/sys/mapper/xml/RegionWareMapper.xml new file mode 100644 index 0000000..ea74838 --- /dev/null +++ b/guigu-ssyx-parent/service/service-sys/src/main/java/com/atguigu/ssyx/sys/mapper/xml/RegionWareMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/guigu-ssyx-parent/service/service-sys/src/main/java/com/atguigu/ssyx/sys/mapper/xml/WareMapper.xml b/guigu-ssyx-parent/service/service-sys/src/main/java/com/atguigu/ssyx/sys/mapper/xml/WareMapper.xml new file mode 100644 index 0000000..0a302a7 --- /dev/null +++ b/guigu-ssyx-parent/service/service-sys/src/main/java/com/atguigu/ssyx/sys/mapper/xml/WareMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/guigu-ssyx-parent/service/service-sys/src/main/java/com/atguigu/ssyx/sys/service/RegionService.java b/guigu-ssyx-parent/service/service-sys/src/main/java/com/atguigu/ssyx/sys/service/RegionService.java new file mode 100644 index 0000000..a0ab1e9 --- /dev/null +++ b/guigu-ssyx-parent/service/service-sys/src/main/java/com/atguigu/ssyx/sys/service/RegionService.java @@ -0,0 +1,20 @@ +package com.atguigu.ssyx.sys.service; + + +import com.atguigu.ssyx.model.sys.Region; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; + +/** + *

+ * 地区表服务类 + *

+ * + * @author atguigu + * @since 2023-09-14 + */ +public interface RegionService extends IService { + + List getRegionByKeyword(String keyword); +} diff --git a/guigu-ssyx-parent/service/service-sys/src/main/java/com/atguigu/ssyx/sys/service/RegionWareService.java b/guigu-ssyx-parent/service/service-sys/src/main/java/com/atguigu/ssyx/sys/service/RegionWareService.java new file mode 100644 index 0000000..fda4627 --- /dev/null +++ b/guigu-ssyx-parent/service/service-sys/src/main/java/com/atguigu/ssyx/sys/service/RegionWareService.java @@ -0,0 +1,25 @@ +package com.atguigu.ssyx.sys.service; + + +import com.atguigu.ssyx.model.sys.RegionWare; +import com.atguigu.ssyx.vo.sys.RegionWareQueryVo; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 城市仓库关联表服务类 + *

+ * + * @author atguigu + * @since 2023-09-14 + */ +public interface RegionWareService extends IService { + + IPage selectPage(Page pageParam, RegionWareQueryVo regionWareQueryVo); + + void saveRegionWare(RegionWare regionWare); + + void updateStatus(Long id, Integer status); +} diff --git a/guigu-ssyx-parent/service/service-sys/src/main/java/com/atguigu/ssyx/sys/service/WareService.java b/guigu-ssyx-parent/service/service-sys/src/main/java/com/atguigu/ssyx/sys/service/WareService.java new file mode 100644 index 0000000..8c1d24d --- /dev/null +++ b/guigu-ssyx-parent/service/service-sys/src/main/java/com/atguigu/ssyx/sys/service/WareService.java @@ -0,0 +1,17 @@ +package com.atguigu.ssyx.sys.service; + + +import com.atguigu.ssyx.model.sys.Ware; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 仓库表服务类 + *

+ * + * @author atguigu + * @since 2023-09-14 + */ +public interface WareService extends IService { + +} diff --git a/guigu-ssyx-parent/service/service-sys/src/main/java/com/atguigu/ssyx/sys/service/impl/RegionServiceImpl.java b/guigu-ssyx-parent/service/service-sys/src/main/java/com/atguigu/ssyx/sys/service/impl/RegionServiceImpl.java new file mode 100644 index 0000000..0f7246e --- /dev/null +++ b/guigu-ssyx-parent/service/service-sys/src/main/java/com/atguigu/ssyx/sys/service/impl/RegionServiceImpl.java @@ -0,0 +1,28 @@ +package com.atguigu.ssyx.sys.service.impl; + + +import com.atguigu.ssyx.model.sys.Region; +import com.atguigu.ssyx.sys.mapper.RegionMapper; +import com.atguigu.ssyx.sys.service.RegionService; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + *

+ * 地区表服务实现类 + *

+ * + * @author atguigu + * @since 2023-09-14 + */ +@Service +public class RegionServiceImpl extends ServiceImpl implements RegionService { + + @Override + public List getRegionByKeyword(String keyword) { + return baseMapper.selectList(new LambdaQueryWrapper().like(Region::getName, keyword)); + } +} diff --git a/guigu-ssyx-parent/service/service-sys/src/main/java/com/atguigu/ssyx/sys/service/impl/RegionWareServiceImpl.java b/guigu-ssyx-parent/service/service-sys/src/main/java/com/atguigu/ssyx/sys/service/impl/RegionWareServiceImpl.java new file mode 100644 index 0000000..c960a52 --- /dev/null +++ b/guigu-ssyx-parent/service/service-sys/src/main/java/com/atguigu/ssyx/sys/service/impl/RegionWareServiceImpl.java @@ -0,0 +1,65 @@ +package com.atguigu.ssyx.sys.service.impl; + +import com.atguigu.ssyx.common.exception.SsyxException; +import com.atguigu.ssyx.common.result.ResultCodeEnum; +import com.atguigu.ssyx.model.sys.RegionWare; +import com.atguigu.ssyx.sys.mapper.RegionWareMapper; +import com.atguigu.ssyx.sys.service.RegionWareService; +import com.atguigu.ssyx.vo.sys.RegionWareQueryVo; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; +import org.springframework.util.StringUtils; + +import javax.annotation.Resource; + +/** + *

+ * 城市仓库关联表服务实现类 + *

+ * + * @author atguigu + * @since 2023-09-14 + */ +@Service +public class RegionWareServiceImpl extends ServiceImpl implements RegionWareService { + + + @Resource + RegionWareMapper regionWareMapper; + + //开通区域列表 + @Override + public IPage selectPage(Page pageParam, RegionWareQueryVo regionWareQueryVo) { + String keyword = regionWareQueryVo.getKeyword(); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + if (!StringUtils.isEmpty(keyword)) { + wrapper + .like(RegionWare::getRegionName, keyword) + .or() + .like(RegionWare::getWareName, keyword); + } + return baseMapper.selectPage(pageParam, wrapper); + } + + //添加开通区域 + @Override + public void saveRegionWare(RegionWare regionWare) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper(); + queryWrapper.eq(RegionWare::getRegionId, regionWare.getRegionId()); + Integer count = regionWareMapper.selectCount(queryWrapper); + if (count > 0) { + throw new SsyxException(ResultCodeEnum.REGION_OPEN); + } + baseMapper.insert(regionWare); + } + + @Override + public void updateStatus(Long id, Integer status) { + RegionWare regionWare = baseMapper.selectById(id); + regionWare.setStatus(status); + baseMapper.updateById(regionWare); + } +} diff --git a/guigu-ssyx-parent/service/service-sys/src/main/java/com/atguigu/ssyx/sys/service/impl/WareServiceImpl.java b/guigu-ssyx-parent/service/service-sys/src/main/java/com/atguigu/ssyx/sys/service/impl/WareServiceImpl.java new file mode 100644 index 0000000..eea3499 --- /dev/null +++ b/guigu-ssyx-parent/service/service-sys/src/main/java/com/atguigu/ssyx/sys/service/impl/WareServiceImpl.java @@ -0,0 +1,20 @@ +package com.atguigu.ssyx.sys.service.impl; + +import com.atguigu.ssyx.model.sys.Ware; +import com.atguigu.ssyx.sys.mapper.WareMapper; +import com.atguigu.ssyx.sys.service.WareService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 仓库表服务实现类 + *

+ * + * @author atguigu + * @since 2023-09-14 + */ +@Service +public class WareServiceImpl extends ServiceImpl implements WareService { + +} diff --git a/guigu-ssyx-parent/service/service-sys/src/main/resources/application-dev.yml b/guigu-ssyx-parent/service/service-sys/src/main/resources/application-dev.yml new file mode 100644 index 0000000..2eeff64 --- /dev/null +++ b/guigu-ssyx-parent/service/service-sys/src/main/resources/application-dev.yml @@ -0,0 +1,18 @@ +server: + port: 8202 + +mybatis-plus: + configuration: + log-impl: org.apache.ibatis.logging.stdout.StdOutImpl + +spring: + datasource: + type: com.zaxxer.hikari.HikariDataSource + driver-class-name: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://82.157.68.223:3306/shequ-sys?characterEncoding=utf-8&useSSL=false + username: shequ-sys + password: shequ-sys + + jackson: + date-format: yyyy-MM-dd HH:mm:ss + time-zone: GMT+8 diff --git a/guigu-ssyx-parent/service/service-sys/src/main/resources/application.yml b/guigu-ssyx-parent/service/service-sys/src/main/resources/application.yml new file mode 100644 index 0000000..94ad167 --- /dev/null +++ b/guigu-ssyx-parent/service/service-sys/src/main/resources/application.yml @@ -0,0 +1,5 @@ +spring: + application: + name: service-sys + profiles: + active: dev diff --git a/ssyx-admin/.editorconfig b/ssyx-admin/.editorconfig new file mode 100644 index 0000000..ea6e20f --- /dev/null +++ b/ssyx-admin/.editorconfig @@ -0,0 +1,14 @@ +# http://editorconfig.org +root = true + +[*] +charset = utf-8 +indent_style = space +indent_size = 2 +end_of_line = lf +insert_final_newline = true +trim_trailing_whitespace = true + +[*.md] +insert_final_newline = false +trim_trailing_whitespace = false diff --git a/ssyx-admin/.env.development b/ssyx-admin/.env.development new file mode 100644 index 0000000..ec6a076 --- /dev/null +++ b/ssyx-admin/.env.development @@ -0,0 +1,6 @@ +# just a flag +ENV = 'development' + +# base api +# VUE_APP_BASE_API = '/dev-api' +VUE_APP_BASE_API = 'http://localhost:8201' diff --git a/ssyx-admin/.env.production b/ssyx-admin/.env.production new file mode 100644 index 0000000..367d835 --- /dev/null +++ b/ssyx-admin/.env.production @@ -0,0 +1,7 @@ +# just a flag +ENV = 'production' + +# base api +#VUE_APP_BASE_API = '/prod-api' +VUE_APP_BASE_API = 'http://localhost:8201' + diff --git a/ssyx-admin/.env.staging b/ssyx-admin/.env.staging new file mode 100644 index 0000000..a8793a0 --- /dev/null +++ b/ssyx-admin/.env.staging @@ -0,0 +1,8 @@ +NODE_ENV = production + +# just a flag +ENV = 'staging' + +# base api +VUE_APP_BASE_API = '/stage-api' + diff --git a/ssyx-admin/.eslintignore b/ssyx-admin/.eslintignore new file mode 100644 index 0000000..e6529fc --- /dev/null +++ b/ssyx-admin/.eslintignore @@ -0,0 +1,4 @@ +build/*.js +src/assets +public +dist diff --git a/ssyx-admin/.eslintrc.js b/ssyx-admin/.eslintrc.js new file mode 100644 index 0000000..31749d5 --- /dev/null +++ b/ssyx-admin/.eslintrc.js @@ -0,0 +1,198 @@ +module.exports = { + root: true, + parserOptions: { + parser: 'babel-eslint', + sourceType: 'module' + }, + env: { + browser: true, + node: true, + es6: true, + }, + extends: ['plugin:vue/recommended', 'eslint:recommended'], + + // add your custom rules here + //it is base on https://github.com/vuejs/eslint-config-vue + rules: { + "vue/max-attributes-per-line": [2, { + "singleline": 10, + "multiline": { + "max": 1, + "allowFirstLine": false + } + }], + "vue/singleline-html-element-content-newline": "off", + "vue/multiline-html-element-content-newline": "off", + "vue/name-property-casing": ["error", "PascalCase"], + "vue/no-v-html": "off", + 'accessor-pairs': 2, + 'arrow-spacing': [2, { + 'before': true, + 'after': true + }], + 'block-spacing': [2, 'always'], + 'brace-style': [2, '1tbs', { + 'allowSingleLine': true + }], + 'camelcase': [0, { + 'properties': 'always' + }], + 'comma-dangle': [2, 'never'], + 'comma-spacing': [2, { + 'before': false, + 'after': true + }], + 'comma-style': [2, 'last'], + 'constructor-super': 2, + 'curly': [2, 'multi-line'], + 'dot-location': [2, 'property'], + 'eol-last': 2, + 'eqeqeq': ["error", "always", {"null": "ignore"}], + 'generator-star-spacing': [2, { + 'before': true, + 'after': true + }], + 'handle-callback-err': [2, '^(err|error)$'], + 'indent': [2, 2, { + 'SwitchCase': 1 + }], + 'jsx-quotes': [2, 'prefer-single'], + 'key-spacing': [2, { + 'beforeColon': false, + 'afterColon': true + }], + 'keyword-spacing': [2, { + 'before': true, + 'after': true + }], + 'new-cap': [2, { + 'newIsCap': true, + 'capIsNew': false + }], + 'new-parens': 2, + 'no-array-constructor': 2, + 'no-caller': 2, + 'no-console': 'off', + 'no-class-assign': 2, + 'no-cond-assign': 2, + 'no-const-assign': 2, + 'no-control-regex': 0, + 'no-delete-var': 2, + 'no-dupe-args': 2, + 'no-dupe-class-members': 2, + 'no-dupe-keys': 2, + 'no-duplicate-case': 2, + 'no-empty-character-class': 2, + 'no-empty-pattern': 2, + 'no-eval': 2, + 'no-ex-assign': 2, + 'no-extend-native': 2, + 'no-extra-bind': 2, + 'no-extra-boolean-cast': 2, + 'no-extra-parens': [2, 'functions'], + 'no-fallthrough': 2, + 'no-floating-decimal': 2, + 'no-func-assign': 2, + 'no-implied-eval': 2, + 'no-inner-declarations': [2, 'functions'], + 'no-invalid-regexp': 2, + 'no-irregular-whitespace': 2, + 'no-iterator': 2, + 'no-label-var': 2, + 'no-labels': [2, { + 'allowLoop': false, + 'allowSwitch': false + }], + 'no-lone-blocks': 2, + 'no-mixed-spaces-and-tabs': 2, + 'no-multi-spaces': 2, + 'no-multi-str': 2, + 'no-multiple-empty-lines': [2, { + 'max': 1 + }], + 'no-native-reassign': 2, + 'no-negated-in-lhs': 2, + 'no-new-object': 2, + 'no-new-require': 2, + 'no-new-symbol': 2, + 'no-new-wrappers': 2, + 'no-obj-calls': 2, + 'no-octal': 2, + 'no-octal-escape': 2, + 'no-path-concat': 2, + 'no-proto': 2, + 'no-redeclare': 2, + 'no-regex-spaces': 2, + 'no-return-assign': [2, 'except-parens'], + 'no-self-assign': 2, + 'no-self-compare': 2, + 'no-sequences': 2, + 'no-shadow-restricted-names': 2, + 'no-spaced-func': 2, + 'no-sparse-arrays': 2, + 'no-this-before-super': 2, + 'no-throw-literal': 2, + 'no-trailing-spaces': 2, + 'no-undef': 2, + 'no-undef-init': 2, + 'no-unexpected-multiline': 2, + 'no-unmodified-loop-condition': 2, + 'no-unneeded-ternary': [2, { + 'defaultAssignment': false + }], + 'no-unreachable': 2, + 'no-unsafe-finally': 2, + 'no-unused-vars': [2, { + 'vars': 'all', + 'args': 'none' + }], + 'no-useless-call': 2, + 'no-useless-computed-key': 2, + 'no-useless-constructor': 2, + 'no-useless-escape': 0, + 'no-whitespace-before-property': 2, + 'no-with': 2, + 'one-var': [2, { + 'initialized': 'never' + }], + 'operator-linebreak': [2, 'after', { + 'overrides': { + '?': 'before', + ':': 'before' + } + }], + 'padded-blocks': [2, 'never'], + 'quotes': [2, 'single', { + 'avoidEscape': true, + 'allowTemplateLiterals': true + }], + 'semi': [2, 'never'], + 'semi-spacing': [2, { + 'before': false, + 'after': true + }], + 'space-before-blocks': [2, 'always'], + 'space-before-function-paren': [2, 'never'], + 'space-in-parens': [2, 'never'], + 'space-infix-ops': 2, + 'space-unary-ops': [2, { + 'words': true, + 'nonwords': false + }], + 'spaced-comment': [2, 'always', { + 'markers': ['global', 'globals', 'eslint', 'eslint-disable', '*package', '!', ','] + }], + 'template-curly-spacing': [2, 'never'], + 'use-isnan': 2, + 'valid-typeof': 2, + 'wrap-iife': [2, 'any'], + 'yield-star-spacing': [2, 'both'], + 'yoda': [2, 'never'], + 'prefer-const': 2, + 'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0, + 'object-curly-spacing': [2, 'always', { + objectsInObjects: false + }], + 'array-bracket-spacing': [2, 'never'] + } +} diff --git a/ssyx-admin/.gitignore b/ssyx-admin/.gitignore new file mode 100644 index 0000000..9ad28d2 --- /dev/null +++ b/ssyx-admin/.gitignore @@ -0,0 +1,16 @@ +.DS_Store +node_modules/ +dist/ +npm-debug.log* +yarn-debug.log* +yarn-error.log* +package-lock.json +tests/**/coverage/ + +# Editor directories and files +.idea +.vscode +*.suo +*.ntvs* +*.njsproj +*.sln diff --git a/ssyx-admin/.travis.yml b/ssyx-admin/.travis.yml new file mode 100644 index 0000000..f4be7a0 --- /dev/null +++ b/ssyx-admin/.travis.yml @@ -0,0 +1,5 @@ +language: node_js +node_js: 10 +script: npm run test +notifications: + email: false diff --git a/ssyx-admin/LICENSE b/ssyx-admin/LICENSE new file mode 100644 index 0000000..6151575 --- /dev/null +++ b/ssyx-admin/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2017-present PanJiaChen + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/ssyx-admin/README-zh.md b/ssyx-admin/README-zh.md new file mode 100644 index 0000000..26a24f1 --- /dev/null +++ b/ssyx-admin/README-zh.md @@ -0,0 +1,115 @@ +# vue-admin-template + +> 这是一个极简的 vue admin 管理后台。它只包含了 Element UI & axios & iconfont & permission control & lint，这些搭建后台必要的东西。 + +[线上地址](http://panjiachen.github.io/vue-admin-template) + +[国内访问](https://panjiachen.gitee.io/vue-admin-template) + +目前版本为 `v4.0+` 基于 `vue-cli` +进行构建，若你想使用旧版本，可以切换分支到[tag/3.11.0](https://github.com/PanJiaChen/vue-admin-template/tree/tag/3.11.0) +，它不依赖 `vue-cli`。 + +

+ SPONSORED BY +

+ + + +

+ +## Extra + +如果你想要根据用户角色来动态生成侧边栏和 +router，你可以使用该分支[permission-control](https://github.com/PanJiaChen/vue-admin-template/tree/permission-control) + +## 相关项目 + +- [vue-element-admin](https://github.com/PanJiaChen/vue-element-admin) + +- [electron-vue-admin](https://github.com/PanJiaChen/electron-vue-admin) + +- [vue-typescript-admin-template](https://github.com/Armour/vue-typescript-admin-template) + +- [awesome-project](https://github.com/PanJiaChen/vue-element-admin/issues/2312) + +写了一个系列的教程配套文章，如何从零构建后一个完整的后台项目: + +- [手摸手，带你用 vue 撸后台系列一(基础篇)](https://juejin.im/post/59097cd7a22b9d0065fb61d2) +- [手摸手，带你用 vue 撸后台系列二(登录权限篇)](https://juejin.im/post/591aa14f570c35006961acac) +- [手摸手，带你用 vue 撸后台系列三 (实战篇)](https://juejin.im/post/593121aa0ce4630057f70d35) +- [手摸手，带你用 vue 撸后台系列四(vueAdmin 一个极简的后台基础模板,专门针对本项目的文章,算作是一篇文档)](https://juejin.im/post/595b4d776fb9a06bbe7dba56) +- [手摸手，带你封装一个 vue component](https://segmentfault.com/a/1190000009090836) + +## Build Setup + +```bash +# 克隆项目 +git clone https://github.com/PanJiaChen/vue-admin-template.git + +# 进入项目目录 +cd vue-admin-template + +# 安装依赖 +npm install + +# 建议不要直接使用 cnpm 安装以来，会有各种诡异的 bug。可以通过如下操作解决 npm 下载速度慢的问题 +npm install --registry=https://registry.npm.taobao.org + +# 启动服务 +npm run dev +``` + +浏览器访问 [http://localhost:9528](http://localhost:9528) + +## 发布 + +```bash +# 构建测试环境 +npm run build:stage + +# 构建生产环境 +npm run build:prod +``` + +## 其它 + +```bash +# 预览发布环境效果 +npm run preview + +# 预览发布环境效果 + 静态资源分析 +npm run preview -- --report + +# 代码格式检查 +npm run lint + +# 代码格式检查并自动修复 +npm run lint -- --fix +``` + +更多信息请参考 [使用文档](https://panjiachen.github.io/vue-element-admin-site/zh/) + +## 购买贴纸 + +你也可以通过购买[官方授权的贴纸](https://smallsticker.com/product/vue-element-admin) 的方式来支持 vue-element-admin - +每售出一张贴纸，我们将获得 2 元的捐赠。 + +## Demo + +![demo](https://github.com/PanJiaChen/PanJiaChen.github.io/blob/master/images/demo.gif) + +## Browsers support + +Modern browsers and Internet Explorer 10+. + +| [

](http://godban.github.io/browsers-support-badges/)
IE / Edge | [

](http://godban.github.io/browsers-support-badges/)
Firefox | [

](http://godban.github.io/browsers-support-badges/)
Chrome | [

+ SPONSORED BY +

+ + + +

+ +## Build Setup + +```bash +# clone the project +git clone https://github.com/PanJiaChen/vue-admin-template.git + +# enter the project directory +cd vue-admin-template + +# install dependency +npm install + +# develop +npm run dev +``` + +This will automatically open http://localhost:9528 + +## Build + +```bash +# build for test environment +npm run build:stage + +# build for production environment +npm run build:prod +``` + +## Advanced + +```bash +# preview the release environment effect +npm run preview + +# preview the release environment effect + static resource analysis +npm run preview -- --report + +# code format check +npm run lint + +# code format check and auto fix +npm run lint -- --fix +``` + +Refer to [Documentation](https://panjiachen.github.io/vue-element-admin-site/guide/essentials/deploy.html) for more +information + +## Demo + +![demo](https://github.com/PanJiaChen/PanJiaChen.github.io/blob/master/images/demo.gif) + +## Extra + +If you want router permission && generate menu by user roles , you can use this +branch [permission-control](https://github.com/PanJiaChen/vue-admin-template/tree/permission-control) + +For `typescript` version, you can +use [vue-typescript-admin-template](https://github.com/Armour/vue-typescript-admin-template) ( +Credits: [@Armour](https://github.com/Armour)) + +## Related Project + +- [vue-element-admin](https://github.com/PanJiaChen/vue-element-admin) + +- [electron-vue-admin](https://github.com/PanJiaChen/electron-vue-admin) + +- [vue-typescript-admin-template](https://github.com/Armour/vue-typescript-admin-template) + +- [awesome-project](https://github.com/PanJiaChen/vue-element-admin/issues/2312) + +## Browsers support + +Modern browsers and Internet Explorer 10+. + +| [

](http://godban.github.io/browsers-support-badges/)
IE / Edge | [

](http://godban.github.io/browsers-support-badges/)
Firefox | [

](http://godban.github.io/browsers-support-badges/)
Chrome | [

](http://godban.github.io/browsers-support-badges/)
Safari | +|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| IE10, IE11, Edge | last 2 versions | last 2 versions | last 2 versions + +## License + +[MIT](https://github.com/PanJiaChen/vue-admin-template/blob/master/LICENSE) license. + +Copyright (c) 2017-present PanJiaChen diff --git a/ssyx-admin/babel.config.js b/ssyx-admin/babel.config.js new file mode 100644 index 0000000..fb82b27 --- /dev/null +++ b/ssyx-admin/babel.config.js @@ -0,0 +1,14 @@ +module.exports = { + presets: [ + // https://github.com/vuejs/vue-cli/tree/master/packages/@vue/babel-preset-app + '@vue/cli-plugin-babel/preset' + ], + 'env': { + 'development': { + // babel-plugin-dynamic-import-node plugin only does one thing by converting all import() to require(). + // This plugin can significantly increase the speed of hot updates, when you have a large number of pages. + // https://panjiachen.github.io/vue-element-admin-site/guide/advanced/lazy-loading.html + 'plugins': ['dynamic-import-node'] + } + } +} diff --git a/ssyx-admin/build/index.js b/ssyx-admin/build/index.js new file mode 100644 index 0000000..c5103f0 --- /dev/null +++ b/ssyx-admin/build/index.js @@ -0,0 +1,35 @@ +const {run} = require('runjs') +const chalk = require('chalk') +const config = require('../vue.config.js') +const rawArgv = process.argv.slice(2) +const args = rawArgv.join(' ') + +if (process.env.npm_config_preview || rawArgv.includes('--preview')) { + const report = rawArgv.includes('--report') + + run(`vue-cli-service build ${args}`) + + const port = 9526 + const publicPath = config.publicPath + + var connect = require('connect') + var serveStatic = require('serve-static') + const app = connect() + + app.use( + publicPath, + serveStatic('./dist', { + index: ['index.html', '/'] + }) + ) + + app.listen(port, function () { + console.log(chalk.green(`> Preview at http://localhost:${port}${publicPath}`)) + if (report) { + console.log(chalk.green(`> Report at http://localhost:${port}${publicPath}report.html`)) + } + + }) +} else { + run(`vue-cli-service build ${args}`) +} diff --git a/ssyx-admin/jest.config.js b/ssyx-admin/jest.config.js new file mode 100644 index 0000000..143cdc8 --- /dev/null +++ b/ssyx-admin/jest.config.js @@ -0,0 +1,24 @@ +module.exports = { + moduleFileExtensions: ['js', 'jsx', 'json', 'vue'], + transform: { + '^.+\\.vue$': 'vue-jest', + '.+\\.(css|styl|less|sass|scss|svg|png|jpg|ttf|woff|woff2)$': + 'jest-transform-stub', + '^.+\\.jsx?$': 'babel-jest' + }, + moduleNameMapper: { + '^@/(.*)$': '/src/$1' + }, + snapshotSerializers: ['jest-serializer-vue'], + testMatch: [ + '**/tests/unit/**/*.spec.(js|jsx|ts|tsx)|**/__tests__/*.(js|jsx|ts|tsx)' + ], + collectCoverageFrom: ['src/utils/**/*.{js,vue}', '!src/utils/auth.js', '!src/utils/request.js', 'src/components/**/*.{js,vue}'], + coverageDirectory: '/tests/unit/coverage', + // 'collectCoverage': true, + 'coverageReporters': [ + 'lcov', + 'text-summary' + ], + testURL: 'http://localhost/' +} diff --git a/ssyx-admin/jsconfig.json b/ssyx-admin/jsconfig.json new file mode 100644 index 0000000..94cf448 --- /dev/null +++ b/ssyx-admin/jsconfig.json @@ -0,0 +1,14 @@ +{ + "compilerOptions": { + "baseUrl": "./", + "paths": { + "@/*": [ + "src/*" + ] + } + }, + "exclude": [ + "node_modules", + "dist" + ] +} diff --git a/ssyx-admin/mock/index.js b/ssyx-admin/mock/index.js new file mode 100644 index 0000000..7d5eb31 --- /dev/null +++ b/ssyx-admin/mock/index.js @@ -0,0 +1,57 @@ +const Mock = require('mockjs') +const {param2Obj} = require('./utils') + +const user = require('./user') +const table = require('./table') + +const mocks = [ + ...user, + ...table +] + +// for front mock +// please use it cautiously, it will redefine XMLHttpRequest, +// which will cause many of your third-party libraries to be invalidated(like progress event). +function mockXHR() { + // mock patch + // https://github.com/nuysoft/Mock/issues/300 + Mock.XHR.prototype.proxy_send = Mock.XHR.prototype.send + Mock.XHR.prototype.send = function () { + if (this.custom.xhr) { + this.custom.xhr.withCredentials = this.withCredentials || false + + if (this.responseType) { + this.custom.xhr.responseType = this.responseType + } + } + this.proxy_send(...arguments) + } + + function XHR2ExpressReqWrap(respond) { + return function (options) { + let result = null + if (respond instanceof Function) { + const {body, type, url} = options + // https://expressjs.com/en/4x/api.html#req + result = respond({ + method: type, + body: JSON.parse(body), + query: param2Obj(url) + }) + } else { + result = respond + } + return Mock.mock(result) + } + } + + for (const i of mocks) { + Mock.mock(new RegExp(i.url), i.type || 'get', XHR2ExpressReqWrap(i.response)) + } +} + +module.exports = { + mocks, + mockXHR +} + diff --git a/ssyx-admin/mock/mock-server.js b/ssyx-admin/mock/mock-server.js new file mode 100644 index 0000000..8a4d435 --- /dev/null +++ b/ssyx-admin/mock/mock-server.js @@ -0,0 +1,81 @@ +const chokidar = require('chokidar') +const bodyParser = require('body-parser') +const chalk = require('chalk') +const path = require('path') +const Mock = require('mockjs') + +const mockDir = path.join(process.cwd(), 'mock') + +function registerRoutes(app) { + let mockLastIndex + const {mocks} = require('./index.js') + const mocksForServer = mocks.map(route => { + return responseFake(route.url, route.type, route.response) + }) + for (const mock of mocksForServer) { + app[mock.type](mock.url, mock.response) + mockLastIndex = app._router.stack.length + } + const mockRoutesLength = Object.keys(mocksForServer).length + return { + mockRoutesLength: mockRoutesLength, + mockStartIndex: mockLastIndex - mockRoutesLength + } +} + +function unregisterRoutes() { + Object.keys(require.cache).forEach(i => { + if (i.includes(mockDir)) { + delete require.cache[require.resolve(i)] + } + }) +} + +// for mock server +const responseFake = (url, type, respond) => { + return { + url: new RegExp(`${process.env.VUE_APP_BASE_API}${url}`), + type: type || 'get', + response(req, res) { + console.log('request invoke:' + req.path) + res.json(Mock.mock(respond instanceof Function ? respond(req, res) : respond)) + } + } +} + +module.exports = app => { + // parse app.body + // https://expressjs.com/en/4x/api.html#req.body + app.use(bodyParser.json()) + app.use(bodyParser.urlencoded({ + extended: true + })) + + const mockRoutes = registerRoutes(app) + var mockRoutesLength = mockRoutes.mockRoutesLength + var mockStartIndex = mockRoutes.mockStartIndex + + // watch files, hot reload mock server + chokidar.watch(mockDir, { + ignored: /mock-server/, + ignoreInitial: true + }).on('all', (event, path) => { + if (event === 'change' || event === 'add') { + try { + // remove mock routes stack + app._router.stack.splice(mockStartIndex, mockRoutesLength) + + // clear routes cache + unregisterRoutes() + + const mockRoutes = registerRoutes(app) + mockRoutesLength = mockRoutes.mockRoutesLength + mockStartIndex = mockRoutes.mockStartIndex + + console.log(chalk.magentaBright(`\n > Mock Server hot reload success! changed ${path}`)) + } catch (error) { + console.log(chalk.redBright(error)) + } + } + }) +} diff --git a/ssyx-admin/mock/table.js b/ssyx-admin/mock/table.js new file mode 100644 index 0000000..bd0e013 --- /dev/null +++ b/ssyx-admin/mock/table.js @@ -0,0 +1,29 @@ +const Mock = require('mockjs') + +const data = Mock.mock({ + 'items|30': [{ + id: '@id', + title: '@sentence(10, 20)', + 'status|1': ['published', 'draft', 'deleted'], + author: 'name', + display_time: '@datetime', + pageviews: '@integer(300, 5000)' + }] +}) + +module.exports = [ + { + url: '/vue-admin-template/table/list', + type: 'get', + response: config => { + const items = data.items + return { + code: 20000, + data: { + total: items.length, + items: items + } + } + } + } +] diff --git a/ssyx-admin/mock/user.js b/ssyx-admin/mock/user.js new file mode 100644 index 0000000..f0e60f9 --- /dev/null +++ b/ssyx-admin/mock/user.js @@ -0,0 +1,83 @@ +const tokens = { + admin: { + token: 'admin-token' + }, + editor: { + token: 'editor-token' + } +} + +const users = { + 'admin-token': { + roles: ['admin'], + introduction: 'I am a super administrator', + avatar: 'https://wpimg.wallstcn.com/f778738c-e4f8-4870-b634-56703b4acafe.gif', + name: 'Super Admin' + }, + 'editor-token': { + roles: ['editor'], + introduction: 'I am an editor', + avatar: 'https://wpimg.wallstcn.com/f778738c-e4f8-4870-b634-56703b4acafe.gif', + name: 'Normal Editor' + } +} + +module.exports = [ + // user login + { + url: '/vue-admin-template/user/login', + type: 'post', + response: config => { + const {username} = config.body + const token = tokens[username] + + // mock error + if (!token) { + return { + code: 60204, + message: 'Account and password are incorrect.' + } + } + + return { + code: 20000, + data: token + } + } + }, + + // get user info + { + url: '/vue-admin-template/user/info\.*', + type: 'get', + response: config => { + const {token} = config.query + const info = users[token] + + // mock error + if (!info) { + return { + code: 50008, + message: 'Login failed, unable to get user details.' + } + } + + return { + code: 20000, + data: info + } + } + }, + + // user logout + { + url: '/vue-admin-template/user/logout', + type: 'post', + response: _ => { + return { + code: 20000, + data: 'success' + } + } + } +] diff --git a/ssyx-admin/mock/utils.js b/ssyx-admin/mock/utils.js new file mode 100644 index 0000000..95cc27d --- /dev/null +++ b/ssyx-admin/mock/utils.js @@ -0,0 +1,25 @@ +/** + * @param {string} url + * @returns {Object} + */ +function param2Obj(url) { + const search = decodeURIComponent(url.split('?')[1]).replace(/\+/g, ' ') + if (!search) { + return {} + } + const obj = {} + const searchArr = search.split('&') + searchArr.forEach(v => { + const index = v.indexOf('=') + if (index !== -1) { + const name = v.substring(0, index) + const val = v.substring(index + 1, v.length) + obj[name] = val + } + }) + return obj +} + +module.exports = { + param2Obj +} diff --git a/ssyx-admin/package.json b/ssyx-admin/package.json new file mode 100644 index 0000000..2413824 --- /dev/null +++ b/ssyx-admin/package.json @@ -0,0 +1,62 @@ +{ + "name": "vue-admin-template", + "version": "4.4.0", + "description": "A vue admin template with Element UI & axios & iconfont & permission control & lint", + "author": "Pan ", + "scripts": { + "dev": "vue-cli-service serve", + "build:prod": "vue-cli-service build", + "build:stage": "vue-cli-service build --mode staging", + "preview": "node build/index.js --preview", + "svgo": "svgo -f src/icons/svg --config=src/icons/svgo.yml", + "lint": "eslint --ext .js,.vue src", + "test:unit": "jest --clearCache && vue-cli-service test:unit", + "test:ci": "npm run lint && npm run test:unit" + }, + "dependencies": { + "axios": "0.18.1", + "core-js": "3.6.5", + "element-ui": "2.13.2", + "js-cookie": "2.2.0", + "normalize.css": "7.0.0", + "nprogress": "0.2.0", + "path-to-regexp": "2.4.0", + "vue": "2.6.10", + "vue-router": "3.0.6", + "vuex": "3.1.0" + }, + "devDependencies": { + "@vue/cli-plugin-babel": "4.4.4", + "@vue/cli-plugin-eslint": "4.4.4", + "@vue/cli-plugin-unit-jest": "4.4.4", + "@vue/cli-service": "4.4.4", + "@vue/test-utils": "1.0.0-beta.29", + "autoprefixer": "9.5.1", + "babel-eslint": "10.1.0", + "babel-jest": "23.6.0", + "babel-plugin-dynamic-import-node": "2.3.3", + "chalk": "2.4.2", + "connect": "3.6.6", + "eslint": "6.7.2", + "eslint-plugin-vue": "6.2.2", + "html-webpack-plugin": "3.2.0", + "mockjs": "1.0.1-beta3", + "runjs": "4.3.2", + "sass": "1.26.8", + "sass-loader": "8.0.2", + "script-ext-html-webpack-plugin": "2.1.3", + "serve-static": "1.13.2", + "svg-sprite-loader": "4.1.3", + "svgo": "1.2.2", + "vue-template-compiler": "2.6.10" + }, + "browserslist": [ + "> 1%", + "last 2 versions" + ], + "engines": { + "node": ">=8.9", + "npm": ">= 3.0.0" + }, + "license": "MIT" +} diff --git a/ssyx-admin/postcss.config.js b/ssyx-admin/postcss.config.js new file mode 100644 index 0000000..10473ef --- /dev/null +++ b/ssyx-admin/postcss.config.js @@ -0,0 +1,8 @@ +// https://github.com/michael-ciniawsky/postcss-load-config + +module.exports = { + 'plugins': { + // to edit target browsers: use "browserslist" field in package.json + 'autoprefixer': {} + } +} diff --git a/ssyx-admin/public/favicon.ico b/ssyx-admin/public/favicon.ico new file mode 100644 index 0000000..34b63ac Binary files /dev/null and b/ssyx-admin/public/favicon.ico differ diff --git a/ssyx-admin/public/index.html b/ssyx-admin/public/index.html new file mode 100644 index 0000000..8c9f022 --- /dev/null +++ b/ssyx-admin/public/index.html @@ -0,0 +1,18 @@ + + + + + + + + <%= webpackConfig.name %> + + + +

活动标题	{{ activityInfo.activityName }}	活动时间	{{ activityInfo.startTime }}至{{ activityInfo.endTime }}
活动类型	{{ activityInfo.activityTypeString }}	创建时间	{{ activityInfo.createTime }}
活动描述	{{ activityInfo.activityDesc }}

优惠券名称	{{ couponInfo.couponName }}	优惠券类型	+ {{ couponInfo.couponTypeString }} +
发行数量	{{ couponInfo.publishCount }}	每人限领次数	{{ couponInfo.perLimit }}
领取时间	{{ couponInfo.startTime }}至{{ couponInfo.endTime }}	过期时间	{{ couponInfo.expireTime }}

订单单号	{{ orderInfo.orderNo }}	下单时间	{{ orderInfo.createTime }}
支付时间	{{ orderInfo.paymentTime }}	支付方式	微信
订单状态	{{ orderInfo.param.orderStatusName }}	+	+

姓名	{{ orderInfo.receiverName }}	电话	{{ orderInfo.receiverPhone }}
团长名称	{{ orderInfo.leaderName }}	提货点	{{ orderInfo.takeName }}
收货地址	{{ orderInfo.receiverAddress }}

商品总金额	{{ orderInfo.originalTotalAmount }}	返现	{{ orderInfo.activityAmount }}
使用优惠券	{{ orderInfo.couponAmount }}	实际支付	{{ orderInfo.totalAmount }}

+ + + diff --git a/ssyx-admin/src/App.vue b/ssyx-admin/src/App.vue new file mode 100644 index 0000000..721d3a3 --- /dev/null +++ b/ssyx-admin/src/App.vue @@ -0,0 +1,11 @@ + + + diff --git a/ssyx-admin/src/api/acl/permission.js b/ssyx-admin/src/api/acl/permission.js new file mode 100644 index 0000000..bff8bde --- /dev/null +++ b/ssyx-admin/src/api/acl/permission.js @@ -0,0 +1,72 @@ +import request from '@/utils/request' + +/* +权限管理相关的API请求函数 +*/ +const api_name = '/admin/acl/permission' + +export default { + + /* + 获取权限(菜单/功能)列表 + */ + getPermissionList() { + return request({ + url: `${api_name}`, + method: 'get' + }) + }, + + /* + 删除一个权限项 + */ + removePermission(id) { + return request({ + url: `${api_name}/remove/${id}`, + method: 'delete' + }) + }, + + /* + 保存一个权限项 + */ + addPermission(permission) { + return request({ + url: `${api_name}/save`, + method: 'post', + data: permission + }) + }, + + /* + 更新一个权限项 + */ + updatePermission(permission) { + return request({ + url: `${api_name}/update`, + method: 'put', + data: permission + }) + }, + + /* + 查看某个角色的权限列表 + */ + toAssign(roleId) { + return request({ + url: `${api_name}/toAssign/${roleId}`, + method: 'get' + }) + }, + + /* + 给某个角色授权 + */ + doAssign(roleId, permissionId) { + return request({ + url: `${api_name}/doAssign`, + method: 'post', + params: {roleId, permissionId} + }) + } +} diff --git a/ssyx-admin/src/api/acl/role.js b/ssyx-admin/src/api/acl/role.js new file mode 100644 index 0000000..c0496f7 --- /dev/null +++ b/ssyx-admin/src/api/acl/role.js @@ -0,0 +1,83 @@ +/* +角色管理相关的API请求函数 +*/ +import request from '@/utils/request' + +const api_name = '/admin/acl/role' + +export default { + + /* + 获取角色分页列表(带搜索) + */ + getPageList(page, limit, searchObj) { + return request({ + url: `${api_name}/${page}/${limit}`, + method: 'get', + params: searchObj // url查询字符串或表单键值对 + }) + }, + + /* + 保存一个新角色 + */ + save(role) { + return request({ + url: `${api_name}/save`, + method: 'post', + data: role + }) + }, + + /* + 获取某个角色 + */ + getById(id) { + return request({ + url: `${api_name}/get/${id}`, + method: 'get' + }) + }, + + /* + 更新一个角色 + */ + updateById(role) { + return request({ + url: `${api_name}/update`, + method: 'put', + data: role + }) + }, + + /* + 获取一个角色的所有权限列表 + */ + getAssign(roleId) { + return request({ + url: `${api_name}/toAssign/${roleId}`, + method: 'get' + }) + }, + + /* + 删除某个角色 + */ + removeById(id) { + return request({ + url: `${api_name}/remove/${id}`, + method: 'delete' + }) + }, + + /* + 批量删除多个角色 + */ + removeRoles(ids) { + return request({ + url: `${api_name}/batchRemove`, + method: 'delete', + data: ids + }) + } +} diff --git a/ssyx-admin/src/api/acl/user.js b/ssyx-admin/src/api/acl/user.js new file mode 100644 index 0000000..5d8caf1 --- /dev/null +++ b/ssyx-admin/src/api/acl/user.js @@ -0,0 +1,131 @@ +import request from '@/utils/request' + +const api_name = '/admin/acl/user' + +/* +登陆 +*/ +export function login({username, password}) { + return request({ + url: '/admin/acl/index/login', + method: 'post', + data: {username, password} + }) +} + +/* +获取用户信息(根据token) +*/ +export function getInfo() { + return request({ + url: '/admin/acl/index/info', + method: 'get' + }) +} + +/* +登出 +*/ +export function logout() { + return request({ + url: '/admin/acl/index/logout', + method: 'post' + }) +} + +/* +获取当前用户的菜单权限列表 +*/ +export function getMenu() { + return request('/admin/acl/index/menu') +} + +/* +获取后台用户分页列表(带搜索) +*/ +export function getPageList(page, limit, searchObj) { + return request({ + url: `${api_name}/${page}/${limit}`, + method: 'get', + params: searchObj + }) +} + +/* +根据ID获取某个后台用户 +*/ +export function getById(id) { + return request({ + url: `${api_name}/get/${id}`, + method: 'get' + }) +} + +/* +保存一个新的后台用户 +*/ +export function add(user) { + return request({ + url: `${api_name}/save`, + method: 'post', + data: user + }) +} + +/* +更新一个后台用户 +*/ +export function update(user) { + return request({ + url: `${api_name}/update`, + method: 'put', + data: user + }) +} + +/* +获取某个用户的所有角色 +*/ +export function getRoles(adminId) { + return request({ + url: `${api_name}/toAssign/${adminId}`, + method: 'get' + }) +} + +/* +给某个用户分配角色 +roleId的结构: 字符串, 'rId1,rId2,rId3' +*/ +export function assignRoles(adminId, roleId) { + return request({ + url: `${api_name}/doAssign`, + method: 'post', + params: { + adminId, + roleId + } + }) +} + +/* +删除某个用户 +*/ +export function removeById(id) { + return request({ + url: `${api_name}/remove/${id}`, + method: 'delete' + }) +} + +/* +批量删除多个用户 +ids的结构: ids是包含n个id的数组 +*/ +export function removeUsers(ids) { + return request({ + url: `${api_name}/batchRemove`, + method: 'delete', + data: ids + }) +} diff --git a/ssyx-admin/src/api/activity/activityInfo.js b/ssyx-admin/src/api/activity/activityInfo.js new file mode 100644 index 0000000..508b249 --- /dev/null +++ b/ssyx-admin/src/api/activity/activityInfo.js @@ -0,0 +1,69 @@ +import request from '@/utils/request' + +const api_name = '/admin/activity/activityInfo' + +export default { + + getPageList(page, limit) { + return request({ + url: `${api_name}/${page}/${limit}`, + method: 'get' + }) + }, + getById(id) { + return request({ + url: `${api_name}/get/${id}`, + method: 'get' + }) + }, + + save(role) { + return request({ + url: `${api_name}/save`, + method: 'post', + data: role + }) + }, + + updateById(role) { + return request({ + url: `${api_name}/update`, + method: 'put', + data: role + }) + }, + removeById(id) { + return request({ + url: `${api_name}/remove/${id}`, + method: 'delete' + }) + }, + removeRows(idList) { + return request({ + url: `${api_name}/batchRemove`, + method: 'delete', + data: idList + }) + }, + + findActivityRuleList(id) { + return request({ + url: `${api_name}/findActivityRuleList/${id}`, + method: 'get' + }) + }, + saveActivityRule(rule) { + return request({ + url: `${api_name}/saveActivityRule`, + method: 'post', + data: rule + }) + }, + + findSkuInfoByKeyword(keyword) { + return request({ + url: `${api_name}/findSkuInfoByKeyword/${keyword}`, + method: 'get' + }) + } +} diff --git a/ssyx-admin/src/api/activity/couponInfo.js b/ssyx-admin/src/api/activity/couponInfo.js new file mode 100644 index 0000000..c0e82a3 --- /dev/null +++ b/ssyx-admin/src/api/activity/couponInfo.js @@ -0,0 +1,69 @@ +import request from '@/utils/request' + +const api_name = '/admin/activity/couponInfo' + +export default { + + getPageList(page, limit) { + return request({ + url: `${api_name}/${page}/${limit}`, + method: 'get' + }) + }, + getById(id) { + return request({ + url: `${api_name}/get/${id}`, + method: 'get' + }) + }, + + save(role) { + return request({ + url: `${api_name}/save`, + method: 'post', + data: role + }) + }, + + updateById(role) { + return request({ + url: `${api_name}/update`, + method: 'put', + data: role + }) + }, + removeById(id) { + return request({ + url: `${api_name}/remove/${id}`, + method: 'delete' + }) + }, + removeRows(idList) { + return request({ + url: `${api_name}/batchRemove`, + method: 'delete', + data: idList + }) + }, + + findCouponRuleList(id) { + return request({ + url: `${api_name}/findCouponRuleList/${id}`, + method: 'get' + }) + }, + saveCouponRule(rule) { + return request({ + url: `${api_name}/saveCouponRule`, + method: 'post', + data: rule + }) + }, + + findCouponByKeyword(keyword) { + return request({ + url: `${api_name}/findCouponByKeyword/${keyword}`, + method: 'get' + }) + } +} diff --git a/ssyx-admin/src/api/activity/seckill.js b/ssyx-admin/src/api/activity/seckill.js new file mode 100644 index 0000000..efb58ea --- /dev/null +++ b/ssyx-admin/src/api/activity/seckill.js @@ -0,0 +1,55 @@ +import request from '@/utils/request' + +const api_name = '/admin/activity/seckill' + +export default { + + getPageList(page, limit, searchObj) { + return request({ + url: `${api_name}/${page}/${limit}`, + method: 'get', + params: searchObj + }) + }, + getById(id) { + return request({ + url: `${api_name}/get/${id}`, + method: 'get' + }) + }, + + save(role) { + return request({ + url: `${api_name}/save`, + method: 'post', + data: role + }) + }, + + updateById(role) { + return request({ + url: `${api_name}/update`, + method: 'put', + data: role + }) + }, + removeById(id) { + return request({ + url: `${api_name}/remove/${id}`, + method: 'delete' + }) + }, + removeRows(idList) { + return request({ + url: `${api_name}/batchRemove`, + method: 'delete', + data: idList + }) + }, + updateStatus(id, status) { + return request({ + url: `${api_name}/updateStatus/${id}/${status}`, + method: 'post' + }) + } +} diff --git a/ssyx-admin/src/api/activity/seckillSku.js b/ssyx-admin/src/api/activity/seckillSku.js new file mode 100644 index 0000000..f134110 --- /dev/null +++ b/ssyx-admin/src/api/activity/seckillSku.js @@ -0,0 +1,49 @@ +import request from '@/utils/request' + +const api_name = '/admin/activity/seckillSku' + +export default { + + getPageList(page, limit, searchObj) { + return request({ + url: `${api_name}/${page}/${limit}`, + method: 'get', + params: searchObj + }) + }, + getById(id) { + return request({ + url: `${api_name}/get/${id}`, + method: 'get' + }) + }, + + save(role) { + return request({ + url: `${api_name}/save`, + method: 'post', + data: role + }) + }, + + updateById(role) { + return request({ + url: `${api_name}/update`, + method: 'put', + data: role + }) + }, + removeById(id) { + return request({ + url: `${api_name}/remove/${id}`, + method: 'delete' + }) + }, + removeRows(idList) { + return request({ + url: `${api_name}/batchRemove`, + method: 'delete', + data: idList + }) + } +} diff --git a/ssyx-admin/src/api/activity/seckillTime.js b/ssyx-admin/src/api/activity/seckillTime.js new file mode 100644 index 0000000..39b348f --- /dev/null +++ b/ssyx-admin/src/api/activity/seckillTime.js @@ -0,0 +1,54 @@ +import request from '@/utils/request' + +const api_name = '/admin/activity/seckillTime' + +export default { + + getList() { + return request({ + url: `${api_name}`, + method: 'get' + }) + }, + getById(id) { + return request({ + url: `${api_name}/get/${id}`, + method: 'get' + }) + }, + + save(role) { + return request({ + url: `${api_name}/save`, + method: 'post', + data: role + }) + }, + + updateById(role) { + return request({ + url: `${api_name}/update`, + method: 'put', + data: role + }) + }, + removeById(id) { + return request({ + url: `${api_name}/remove/${id}`, + method: 'delete' + }) + }, + removeRows(idList) { + return request({ + url: `${api_name}/batchRemove`, + method: 'delete', + data: idList + }) + }, + updateStatus(id, status) { + return request({ + url: `${api_name}/updateStatus/${id}/${status}`, + method: 'post' + }) + } +} diff --git a/ssyx-admin/src/api/index.js b/ssyx-admin/src/api/index.js new file mode 100644 index 0000000..2338ef1 --- /dev/null +++ b/ssyx-admin/src/api/index.js @@ -0,0 +1,3 @@ +export * as user from './acl/user' +export {default as role} from './acl/role' +export {default as permission} from './acl/permission' diff --git a/ssyx-admin/src/api/order/orderInfo.js b/ssyx-admin/src/api/order/orderInfo.js new file mode 100644 index 0000000..2f9d35e --- /dev/null +++ b/ssyx-admin/src/api/order/orderInfo.js @@ -0,0 +1,43 @@ +import request from '@/utils/request' + +const api_name = '/admin/order/orderInfo' + +export default { + + getPageList(page, limit, searchObj) { + return request({ + url: `${api_name}/${page}/${limit}`, + method: 'get', + params: searchObj // url查询字符串或表单键值对 + }) + }, + + show(orderId) { + return request({ + url: `${api_name}/get/${orderId}`, + method: 'get' + }) + }, + + deliver(orderDeliverVo) { + return request({ + url: `${api_name}/deliver`, + method: 'post', + data: orderDeliverVo + }) + }, + + findReceiveList(wareId, date) { + return request({ + url: `${api_name}/findReceiveList/${wareId}/${date}`, + method: 'get' + }) + }, + + findLeaderReceiveList(leaderId, date) { + return request({ + url: `${api_name}/findLeaderReceiveList/${leaderId}/${date}`, + method: 'get' + }) + } +} diff --git a/ssyx-admin/src/api/product/attr.js b/ssyx-admin/src/api/product/attr.js new file mode 100644 index 0000000..1ef449f --- /dev/null +++ b/ssyx-admin/src/api/product/attr.js @@ -0,0 +1,48 @@ +import request from '@/utils/request' + +const api_name = '/admin/product/attr' + +export default { + + getList(groupId) { + return request({ + url: `${api_name}/${groupId}`, + method: 'get' + }) + }, + getById(id) { + return request({ + url: `${api_name}/get/${id}`, + method: 'get' + }) + }, + + save(role) { + return request({ + url: `${api_name}/save`, + method: 'post', + data: role + }) + }, + + updateById(role) { + return request({ + url: `${api_name}/update`, + method: 'put', + data: role + }) + }, + removeById(id) { + return request({ + url: `${api_name}/remove/${id}`, + method: 'delete' + }) + }, + removeRows(idList) { + return request({ + url: `${api_name}/batchRemove`, + method: 'delete', + data: idList + }) + } +} diff --git a/ssyx-admin/src/api/product/attrGroup.js b/ssyx-admin/src/api/product/attrGroup.js new file mode 100644 index 0000000..2705fd3 --- /dev/null +++ b/ssyx-admin/src/api/product/attrGroup.js @@ -0,0 +1,56 @@ +import request from '@/utils/request' + +const api_name = '/admin/product/attrGroup' + +export default { + + getPageList(page, limit, searchObj) { + return request({ + url: `${api_name}/${page}/${limit}`, + method: 'get', + params: searchObj + }) + }, + getById(id) { + return request({ + url: `${api_name}/get/${id}`, + method: 'get' + }) + }, + + save(role) { + return request({ + url: `${api_name}/save`, + method: 'post', + data: role + }) + }, + + updateById(role) { + return request({ + url: `${api_name}/update`, + method: 'put', + data: role + }) + }, + removeById(id) { + return request({ + url: `${api_name}/remove/${id}`, + method: 'delete' + }) + }, + removeRows(idList) { + return request({ + url: `${api_name}/batchRemove`, + method: 'delete', + data: idList + }) + }, + + findAllList() { + return request({ + url: `${api_name}/findAllList`, + method: 'get' + }) + } +} diff --git a/ssyx-admin/src/api/product/category.js b/ssyx-admin/src/api/product/category.js new file mode 100644 index 0000000..a8436ca --- /dev/null +++ b/ssyx-admin/src/api/product/category.js @@ -0,0 +1,56 @@ +import request from '@/utils/request' + +const api_name = '/admin/product/category' + +export default { + + getPageList(page, limit, searchObj) { + return request({ + url: `${api_name}/${page}/${limit}`, + method: 'get', + params: searchObj + }) + }, + getById(id) { + return request({ + url: `${api_name}/get/${id}`, + method: 'get' + }) + }, + + save(role) { + return request({ + url: `${api_name}/save`, + method: 'post', + data: role + }) + }, + + updateById(role) { + return request({ + url: `${api_name}/update`, + method: 'put', + data: role + }) + }, + removeById(id) { + return request({ + url: `${api_name}/remove/${id}`, + method: 'delete' + }) + }, + removeRows(idList) { + return request({ + url: `${api_name}/batchRemove`, + method: 'delete', + data: idList + }) + }, + + findAllList() { + return request({ + url: `${api_name}/findAllList`, + method: 'get' + }) + } +} diff --git a/ssyx-admin/src/api/product/skuInfo.js b/ssyx-admin/src/api/product/skuInfo.js new file mode 100644 index 0000000..0d33343 --- /dev/null +++ b/ssyx-admin/src/api/product/skuInfo.js @@ -0,0 +1,73 @@ +import request from '@/utils/request' + +const api_name = '/admin/product/skuInfo' + +export default { + + getPageList(page, limit, searchObj) { + return request({ + url: `${api_name}/${page}/${limit}`, + method: 'get', + params: searchObj + }) + }, + getById(id) { + return request({ + url: `${api_name}/get/${id}`, + method: 'get' + }) + }, + + save(role) { + return request({ + url: `${api_name}/save`, + method: 'post', + data: role + }) + }, + + updateById(role) { + return request({ + url: `${api_name}/update`, + method: 'put', + data: role + }) + }, + removeById(id) { + return request({ + url: `${api_name}/remove/${id}`, + method: 'delete' + }) + }, + removeRows(idList) { + return request({ + url: `${api_name}/batchRemove`, + method: 'delete', + data: idList + }) + }, + + // 商品上架 + publish(id, status) { + return request({ + url: `${api_name}/publish/${id}/${status}`, + method: 'get' + }) + }, + + // 商品审核 + check(id, status) { + return request({ + url: `${api_name}/check/${id}/${status}`, + method: 'get' + }) + }, + + // 新人专享 + isNewPerson(id, status) { + return request({ + url: `${api_name}/isNewPerson/${id}/${status}`, + method: 'get' + }) + } +} diff --git a/ssyx-admin/src/api/sys/region.js b/ssyx-admin/src/api/sys/region.js new file mode 100644 index 0000000..0949a92 --- /dev/null +++ b/ssyx-admin/src/api/sys/region.js @@ -0,0 +1,20 @@ +import request from '@/utils/request' + +const api_name = '/admin/sys/region' + +export default { + + findRegionByKeyword(keyword) { + return request({ + url: `${api_name}/findRegionByKeyword/${keyword}`, + method: 'get' + }) + }, + + findByParentId(parentId) { + return request({ + url: `${api_name}/findByParentId/${parentId}`, + method: 'get' + }) + } +} diff --git a/ssyx-admin/src/api/sys/regionWare.js b/ssyx-admin/src/api/sys/regionWare.js new file mode 100644 index 0000000..dadc881 --- /dev/null +++ b/ssyx-admin/src/api/sys/regionWare.js @@ -0,0 +1,49 @@ +import request from '@/utils/request' + +const api_name = '/admin/sys/regionWare' + +export default { + + getPageList(page, limit, searchObj) { + return request({ + url: `${api_name}/${page}/${limit}`, + method: 'get', + params: searchObj + }) + }, + getById(id) { + return request({ + url: `${api_name}/get/${id}`, + method: 'get' + }) + }, + + save(role) { + return request({ + url: `${api_name}/save`, + method: 'post', + data: role + }) + }, + + updateStatus(id, status) { + return request({ + url: `${api_name}/updateStatus/${id}/${status}`, + method: 'post' + }) + }, + + removeById(id) { + return request({ + url: `${api_name}/remove/${id}`, + method: 'delete' + }) + }, + removeRows(idList) { + return request({ + url: `${api_name}/batchRemove`, + method: 'delete', + data: idList + }) + } +} diff --git a/ssyx-admin/src/api/sys/ware.js b/ssyx-admin/src/api/sys/ware.js new file mode 100644 index 0000000..dddb2cd --- /dev/null +++ b/ssyx-admin/src/api/sys/ware.js @@ -0,0 +1,57 @@ +import request from '@/utils/request' + +const api_name = '/admin/sys/ware' + +export default { + + getPageList(page, limit, searchObj) { + return request({ + url: `${api_name}/${page}/${limit}`, + method: 'get', + params: searchObj + }) + }, + + getById(id) { + return request({ + url: `${api_name}/get/${id}`, + method: 'get' + }) + }, + + save(role) { + return request({ + url: `${api_name}/save`, + method: 'post', + data: role + }) + }, + + updateById(role) { + return request({ + url: `${api_name}/update`, + method: 'put', + data: role + }) + }, + removeById(id) { + return request({ + url: `${api_name}/remove/${id}`, + method: 'delete' + }) + }, + removeRows(idList) { + return request({ + url: `${api_name}/batchRemove`, + method: 'delete', + data: idList + }) + }, + + findAllList() { + return request({ + url: `${api_name}/findAllList`, + method: 'get' + }) + } +} diff --git a/ssyx-admin/src/api/table.js b/ssyx-admin/src/api/table.js new file mode 100644 index 0000000..2752f52 --- /dev/null +++ b/ssyx-admin/src/api/table.js @@ -0,0 +1,9 @@ +import request from '@/utils/request' + +export function getList(params) { + return request({ + url: '/vue-admin-template/table/list', + method: 'get', + params + }) +} diff --git a/ssyx-admin/src/api/user.js b/ssyx-admin/src/api/user.js new file mode 100644 index 0000000..c9d3dfc --- /dev/null +++ b/ssyx-admin/src/api/user.js @@ -0,0 +1,24 @@ +import request from '@/utils/request' + +export function login(data) { + return request({ + url: '/admin/acl/index/login', + method: 'post', + data + }) +} + +export function getInfo(token) { + return request({ + url: '/admin/acl/index/info', + method: 'get', + params: {token} + }) +} + +export function logout() { + return request({ + url: '/admin/acl/index/logout', + method: 'post' + }) +} diff --git a/ssyx-admin/src/api/user/driver.js b/ssyx-admin/src/api/user/driver.js new file mode 100644 index 0000000..7b30e85 --- /dev/null +++ b/ssyx-admin/src/api/user/driver.js @@ -0,0 +1,12 @@ +import request from '@/utils/request' + +const api_name = '/admin/user/driver' + +export default { + findDriver(wareId) { + return request({ + url: `${api_name}/findDriver/${wareId}`, + method: 'get' + }) + } +} diff --git a/ssyx-admin/src/api/user/leader.js b/ssyx-admin/src/api/user/leader.js new file mode 100644 index 0000000..ffa75d4 --- /dev/null +++ b/ssyx-admin/src/api/user/leader.js @@ -0,0 +1,63 @@ +import request from '@/utils/request' + +const api_name = '/admin/user/leader' + +export default { + + getPageCheckList(page, limit) { + return request({ + url: `${api_name}/checkList/${page}/${limit}`, + method: 'get' + }) + }, + + getPageList(page, limit) { + return request({ + url: `${api_name}/list/${page}/${limit}`, + method: 'get' + }) + }, + + getById(id) { + return request({ + url: `${api_name}/get/${id}`, + method: 'get' + }) + }, + + save(role) { + return request({ + url: `${api_name}/save`, + method: 'post', + data: role + }) + }, + + updateById(role) { + return request({ + url: `${api_name}/update`, + method: 'put', + data: role + }) + }, + removeById(id) { + return request({ + url: `${api_name}/remove/${id}`, + method: 'delete' + }) + }, + removeRows(idList) { + return request({ + url: `${api_name}/batchRemove`, + method: 'delete', + data: idList + }) + }, + + check(id, status) { + return request({ + url: `${api_name}/check/${id}/${status}`, + method: 'post' + }) + } +} diff --git a/ssyx-admin/src/assets/404_images/404.png b/ssyx-admin/src/assets/404_images/404.png new file mode 100644 index 0000000..3d8e230 Binary files /dev/null and b/ssyx-admin/src/assets/404_images/404.png differ diff --git a/ssyx-admin/src/assets/404_images/404_cloud.png b/ssyx-admin/src/assets/404_images/404_cloud.png new file mode 100644 index 0000000..c6281d0 Binary files /dev/null and b/ssyx-admin/src/assets/404_images/404_cloud.png differ diff --git a/ssyx-admin/src/components/Breadcrumb/index.vue b/ssyx-admin/src/components/Breadcrumb/index.vue new file mode 100644 index 0000000..c465a2c --- /dev/null +++ b/ssyx-admin/src/components/Breadcrumb/index.vue @@ -0,0 +1,80 @@ + + + + + diff --git a/ssyx-admin/src/components/Hamburger/index.vue b/ssyx-admin/src/components/Hamburger/index.vue new file mode 100644 index 0000000..c58c55b --- /dev/null +++ b/ssyx-admin/src/components/Hamburger/index.vue @@ -0,0 +1,45 @@ + + + + + diff --git a/ssyx-admin/src/components/HintButton/index.vue b/ssyx-admin/src/components/HintButton/index.vue new file mode 100644 index 0000000..f15d87a --- /dev/null +++ b/ssyx-admin/src/components/HintButton/index.vue @@ -0,0 +1,20 @@ + + + diff --git a/ssyx-admin/src/components/SvgIcon/index.vue b/ssyx-admin/src/components/SvgIcon/index.vue new file mode 100644 index 0000000..8b865bd --- /dev/null +++ b/ssyx-admin/src/components/SvgIcon/index.vue @@ -0,0 +1,62 @@ + + + + + diff --git a/ssyx-admin/src/icons/index.js b/ssyx-admin/src/icons/index.js new file mode 100644 index 0000000..2c6b309 --- /dev/null +++ b/ssyx-admin/src/icons/index.js @@ -0,0 +1,9 @@ +import Vue from 'vue' +import SvgIcon from '@/components/SvgIcon'// svg component + +// register globally +Vue.component('svg-icon', SvgIcon) + +const req = require.context('./svg', false, /\.svg$/) +const requireAll = requireContext => requireContext.keys().map(requireContext) +requireAll(req) diff --git a/ssyx-admin/src/icons/svg/dashboard.svg b/ssyx-admin/src/icons/svg/dashboard.svg new file mode 100644 index 0000000..e2486bc --- /dev/null +++ b/ssyx-admin/src/icons/svg/dashboard.svg @@ -0,0 +1,4 @@ + diff --git a/ssyx-admin/src/icons/svg/example.svg b/ssyx-admin/src/icons/svg/example.svg new file mode 100644 index 0000000..aec80f6 --- /dev/null +++ b/ssyx-admin/src/icons/svg/example.svg @@ -0,0 +1,4 @@ + diff --git a/ssyx-admin/src/icons/svg/eye-open.svg b/ssyx-admin/src/icons/svg/eye-open.svg new file mode 100644 index 0000000..9d3a641 --- /dev/null +++ b/ssyx-admin/src/icons/svg/eye-open.svg @@ -0,0 +1,7 @@ + diff --git a/ssyx-admin/src/icons/svg/eye.svg b/ssyx-admin/src/icons/svg/eye.svg new file mode 100644 index 0000000..7a852d3 --- /dev/null +++ b/ssyx-admin/src/icons/svg/eye.svg @@ -0,0 +1,4 @@ + diff --git a/ssyx-admin/src/icons/svg/form.svg b/ssyx-admin/src/icons/svg/form.svg new file mode 100644 index 0000000..eda0129 --- /dev/null +++ b/ssyx-admin/src/icons/svg/form.svg @@ -0,0 +1,4 @@ + diff --git a/ssyx-admin/src/icons/svg/link.svg b/ssyx-admin/src/icons/svg/link.svg new file mode 100644 index 0000000..c783b80 --- /dev/null +++ b/ssyx-admin/src/icons/svg/link.svg @@ -0,0 +1,5 @@ + diff --git a/ssyx-admin/src/icons/svg/nested.svg b/ssyx-admin/src/icons/svg/nested.svg new file mode 100644 index 0000000..259a491 --- /dev/null +++ b/ssyx-admin/src/icons/svg/nested.svg @@ -0,0 +1,4 @@ + diff --git a/ssyx-admin/src/icons/svg/password.svg b/ssyx-admin/src/icons/svg/password.svg new file mode 100644 index 0000000..bb03dfd --- /dev/null +++ b/ssyx-admin/src/icons/svg/password.svg @@ -0,0 +1,4 @@ + diff --git a/ssyx-admin/src/icons/svg/table.svg b/ssyx-admin/src/icons/svg/table.svg new file mode 100644 index 0000000..bf841c3 --- /dev/null +++ b/ssyx-admin/src/icons/svg/table.svg @@ -0,0 +1,6 @@ + diff --git a/ssyx-admin/src/icons/svg/tree.svg b/ssyx-admin/src/icons/svg/tree.svg new file mode 100644 index 0000000..83d7146 --- /dev/null +++ b/ssyx-admin/src/icons/svg/tree.svg @@ -0,0 +1,4 @@ + diff --git a/ssyx-admin/src/icons/svg/user.svg b/ssyx-admin/src/icons/svg/user.svg new file mode 100644 index 0000000..cb70afd --- /dev/null +++ b/ssyx-admin/src/icons/svg/user.svg @@ -0,0 +1,5 @@ + diff --git a/ssyx-admin/src/icons/svgo.yml b/ssyx-admin/src/icons/svgo.yml new file mode 100644 index 0000000..05c6fbb --- /dev/null +++ b/ssyx-admin/src/icons/svgo.yml @@ -0,0 +1,22 @@ +# replace default config + +# multipass: true +# full: true + +plugins: + + # - name + # + # or: + # - name: false + # - name: true + # + # or: + # - name: + # param1: 1 + # param2: 2 + + - removeAttrs: + attrs: + - 'fill' + - 'fill-rule' diff --git a/ssyx-admin/src/layout/components/AppMain.vue b/ssyx-admin/src/layout/components/AppMain.vue new file mode 100644 index 0000000..67c790a --- /dev/null +++ b/ssyx-admin/src/layout/components/AppMain.vue @@ -0,0 +1,41 @@ + + + + + + + diff --git a/ssyx-admin/src/layout/components/Navbar.vue b/ssyx-admin/src/layout/components/Navbar.vue new file mode 100644 index 0000000..24e0abc --- /dev/null +++ b/ssyx-admin/src/layout/components/Navbar.vue @@ -0,0 +1,139 @@ + + + + + diff --git a/ssyx-admin/src/layout/components/Sidebar/FixiOSBug.js b/ssyx-admin/src/layout/components/Sidebar/FixiOSBug.js new file mode 100644 index 0000000..bc14856 --- /dev/null +++ b/ssyx-admin/src/layout/components/Sidebar/FixiOSBug.js @@ -0,0 +1,26 @@ +export default { + computed: { + device() { + return this.$store.state.app.device + } + }, + mounted() { + // In order to fix the click on menu on the ios device will trigger the mouseleave bug + // https://github.com/PanJiaChen/vue-element-admin/issues/1135 + this.fixBugIniOS() + }, + methods: { + fixBugIniOS() { + const $subMenu = this.$refs.subMenu + if ($subMenu) { + const handleMouseleave = $subMenu.handleMouseleave + $subMenu.handleMouseleave = (e) => { + if (this.device === 'mobile') { + return + } + handleMouseleave(e) + } + } + } + } +} diff --git a/ssyx-admin/src/layout/components/Sidebar/Item.vue b/ssyx-admin/src/layout/components/Sidebar/Item.vue new file mode 100644 index 0000000..2e8a5c4 --- /dev/null +++ b/ssyx-admin/src/layout/components/Sidebar/Item.vue @@ -0,0 +1,41 @@ + + + diff --git a/ssyx-admin/src/layout/components/Sidebar/Link.vue b/ssyx-admin/src/layout/components/Sidebar/Link.vue new file mode 100644 index 0000000..af01052 --- /dev/null +++ b/ssyx-admin/src/layout/components/Sidebar/Link.vue @@ -0,0 +1,43 @@ + + + diff --git a/ssyx-admin/src/layout/components/Sidebar/Logo.vue b/ssyx-admin/src/layout/components/Sidebar/Logo.vue new file mode 100644 index 0000000..040fab6 --- /dev/null +++ b/ssyx-admin/src/layout/components/Sidebar/Logo.vue @@ -0,0 +1,82 @@ + + + + + diff --git a/ssyx-admin/src/layout/components/Sidebar/SidebarItem.vue b/ssyx-admin/src/layout/components/Sidebar/SidebarItem.vue new file mode 100644 index 0000000..dc9c360 --- /dev/null +++ b/ssyx-admin/src/layout/components/Sidebar/SidebarItem.vue @@ -0,0 +1,96 @@ + + + diff --git a/ssyx-admin/src/layout/components/Sidebar/index.vue b/ssyx-admin/src/layout/components/Sidebar/index.vue new file mode 100644 index 0000000..5f2da00 --- /dev/null +++ b/ssyx-admin/src/layout/components/Sidebar/index.vue @@ -0,0 +1,56 @@ + + + diff --git a/ssyx-admin/src/layout/components/index.js b/ssyx-admin/src/layout/components/index.js new file mode 100644 index 0000000..18b4ab4 --- /dev/null +++ b/ssyx-admin/src/layout/components/index.js @@ -0,0 +1,3 @@ +export {default as Navbar} from './Navbar' +export {default as Sidebar} from './Sidebar' +export {default as AppMain} from './AppMain' diff --git a/ssyx-admin/src/layout/index.vue b/ssyx-admin/src/layout/index.vue new file mode 100644 index 0000000..6c11c59 --- /dev/null +++ b/ssyx-admin/src/layout/index.vue @@ -0,0 +1,95 @@ + + + + + diff --git a/ssyx-admin/src/layout/mixin/ResizeHandler.js b/ssyx-admin/src/layout/mixin/ResizeHandler.js new file mode 100644 index 0000000..7f8af65 --- /dev/null +++ b/ssyx-admin/src/layout/mixin/ResizeHandler.js @@ -0,0 +1,45 @@ +import store from '@/store' + +const {body} = document +const WIDTH = 992 // refer to Bootstrap's responsive design + +export default { + watch: { + $route(route) { + if (this.device === 'mobile' && this.sidebar.opened) { + store.dispatch('app/closeSideBar', {withoutAnimation: false}) + } + } + }, + beforeMount() { + window.addEventListener('resize', this.$_resizeHandler) + }, + beforeDestroy() { + window.removeEventListener('resize', this.$_resizeHandler) + }, + mounted() { + const isMobile = this.$_isMobile() + if (isMobile) { + store.dispatch('app/toggleDevice', 'mobile') + store.dispatch('app/closeSideBar', {withoutAnimation: true}) + } + }, + methods: { + // use $_ for mixins properties + // https://vuejs.org/v2/style-guide/index.html#Private-property-names-essential + $_isMobile() { + const rect = body.getBoundingClientRect() + return rect.width - 1 < WIDTH + }, + $_resizeHandler() { + if (!document.hidden) { + const isMobile = this.$_isMobile() + store.dispatch('app/toggleDevice', isMobile ? 'mobile' : 'desktop') + + if (isMobile) { + store.dispatch('app/closeSideBar', {withoutAnimation: true}) + } + } + } + } +} diff --git a/ssyx-admin/src/main.js b/ssyx-admin/src/main.js new file mode 100644 index 0000000..499e277 --- /dev/null +++ b/ssyx-admin/src/main.js @@ -0,0 +1,51 @@ +import Vue from 'vue' + +import 'normalize.css/normalize.css' // A modern alternative to CSS resets + +import ElementUI from 'element-ui' +import 'element-ui/lib/theme-chalk/index.css' +import locale from 'element-ui/lib/locale/lang/en' // lang i18n + +import '@/styles/index.scss' // global css + +import App from './App' +import store from './store' +import router from './router' + +import * as API from '@/api' +import HintButton from '@/components/HintButton' +import hasBtnPermission from '@/utils/btn-permission' + +import '@/icons' // icon +import '@/permission' // permission control + +Vue.prototype.$API = API +Vue.component(HintButton.name, HintButton) +Vue.prototype.$hasBP = hasBtnPermission + +/** + * If you don't want to use mock-server + * you want to use MockJs for mock api + * you can execute: mockXHR() + * + * Currently MockJs will be used in the production environment, + * please remove it before going online ! ! ! + */ +if (process.env.NODE_ENV === 'production') { + const {mockXHR} = require('../mock') + mockXHR() +} + +// set ElementUI lang to EN +Vue.use(ElementUI, {locale}) +// 如果想要中文版 element-ui，按如下方式声明 +// Vue.use(ElementUI) + +Vue.config.productionTip = false + +new Vue({ + el: '#app', + router, + store, + render: h => h(App) +}) diff --git a/ssyx-admin/src/permission.js b/ssyx-admin/src/permission.js new file mode 100644 index 0000000..81e9490 --- /dev/null +++ b/ssyx-admin/src/permission.js @@ -0,0 +1,64 @@ +import router from './router' +import store from './store' +import {Message} from 'element-ui' +import NProgress from 'nprogress' // progress bar +import 'nprogress/nprogress.css' // progress bar style +import {getToken} from '@/utils/auth' // get token from cookie +import getPageTitle from '@/utils/get-page-title' + +NProgress.configure({showSpinner: false}) // NProgress Configuration + +const whiteList = ['/login'] // no redirect whitelist + +router.beforeEach(async (to, from, next) => { + // start progress bar + NProgress.start() + + // set page title + document.title = getPageTitle(to.meta.title) + + // determine whether the user has logged in + const hasToken = getToken() + + if (hasToken) { + if (to.path === '/login') { + // if is logged in, redirect to the home page + next({path: '/'}) + NProgress.done() + } else { + const hasGetUserInfo = store.getters.name + if (hasGetUserInfo) { + next() + } else { + try { + // get user info + await store.dispatch('user/getInfo') + + next() + } catch (error) { + // remove token and go to login page to re-login + await store.dispatch('user/resetToken') + Message.error(error || 'Has Error') + next(`/login?redirect=${to.path}`) + NProgress.done() + } + } + } + } else { + /* has no token*/ + + if (whiteList.indexOf(to.path) !== -1) { + // in the free login whitelist, go directly + next() + } else { + // other pages that do not have permission to access are redirected to the login page. + next(`/login?redirect=${to.path}`) + NProgress.done() + } + } +}) + +router.afterEach(() => { + // finish progress bar + NProgress.done() +}) diff --git a/ssyx-admin/src/router/index.js b/ssyx-admin/src/router/index.js new file mode 100644 index 0000000..f1f7faa --- /dev/null +++ b/ssyx-admin/src/router/index.js @@ -0,0 +1,384 @@ +import Vue from 'vue' +import Router from 'vue-router' + +Vue.use(Router) + +/* Layout */ +import Layout from '@/layout' + +/** + * Note: sub-menu only appear when route children.length >= 1 + * Detail see: https://panjiachen.github.io/vue-element-admin-site/guide/essentials/router-and-nav.html + * + * hidden: true if set true, item will not show in the sidebar(default is false) + * alwaysShow: true if set true, will always show the root menu + * if not set alwaysShow, when item has more than one children route, + * it will becomes nested mode, otherwise not show the root menu + * redirect: noRedirect if set noRedirect will no redirect in the breadcrumb + * name:'router-name' the name is used by (must set!!!) + * meta : { + roles: ['admin','editor'] control the page roles (you can set multiple roles) + title: 'title' the name show in sidebar and breadcrumb (recommend set) + icon: 'svg-name'/'el-icon-x' the icon show in the sidebar + breadcrumb: false if set false, the item will hidden in breadcrumb(default is true) + activeMenu: '/example/list' if set path, the sidebar will highlight the path you set + } + */ + +/** + * constantRoutes + * a base page that does not have permission requirements + * all roles can be accessed + */ +export const constantRoutes = [ + { + path: '/login', + component: () => import('@/views/login/index'), + hidden: true + }, + + { + path: '/404', + component: () => import('@/views/404'), + hidden: true + }, + + { + path: '/', + component: Layout, + redirect: '/dashboard', + children: [{ + path: 'dashboard', + name: 'Dashboard', + component: () => import('@/views/dashboard/index'), + meta: {title: 'Dashboard', icon: 'dashboard'} + }] + }, + + /* 权限管理 */ + { + name: 'Acl', + path: '/acl', + component: Layout, + redirect: '/acl/user/list', + meta: { + title: '权限管理', + icon: 'el-icon-lock' + }, + children: [ + { + name: 'User', + path: 'user/list', + component: () => import('@/views/acl/user/list'), + meta: { + title: '用户管理' + } + }, + { + name: 'Role', + path: 'role/list', + component: () => import('@/views/acl/role/list'), + meta: { + title: '角色管理' + } + }, + { + name: 'RoleAuth', + path: 'role/auth/:id', + component: () => import('@/views/acl/role/roleAuth'), + meta: { + activeMenu: '/acl/role/list', + title: '角色授权' + }, + hidden: true + }, + { + name: 'Permission', + path: 'permission/list', + component: () => import('@/views/acl/permission/list'), + meta: { + title: '菜单管理' + } + } + ] + }, + + { + name: 'Sys', + path: '/sys', + component: Layout, + redirect: '/sys/list', + meta: { + title: '系统管理', + icon: 'el-icon-lock' + }, + alwaysShow: true, + children: [ + { + name: 'RegionWare', + path: 'regionWare/list', + component: () => import('@/views/sys/regionWare/list'), + meta: { + title: '开通区域' + } + } + ] + }, + + { + name: 'Product', + path: '/product', + component: Layout, + redirect: '/product/category/list', + meta: {title: '商品信息管理', icon: 'dashboard'}, + alwaysShow: true, + children: [ + { + path: 'category/list', + name: 'Category', + component: () => import('@/views/product/category/list'), + meta: {title: '商品分类'} + }, + { + path: 'category/add', + name: 'CategoryAdd', + component: () => import('@/views/product/category/form'), + meta: {title: '添加'}, + hidden: true + }, + { + path: 'category/edit/:id', + name: 'CategoryEdit', + component: () => import('@/views/product/category/form'), + meta: {title: '编辑', noCache: true}, + hidden: true + }, + { + path: 'attrGroup/list', + name: 'AttrGroup', + component: () => import('@/views/product/attrGroup/list'), + meta: {title: '平台属性分组'} + }, + { + path: 'attrGroup/add', + name: 'AttrGroupAdd', + component: () => import('@/views/product/attrGroup/form'), + meta: {title: '添加'}, + hidden: true + }, + { + path: 'attrGroup/edit/:id', + name: 'AttrGroupEdit', + component: () => import('@/views/product/attrGroup/form'), + meta: {title: '编辑', noCache: true}, + hidden: true + }, + { + path: 'attr/list/:id', + name: 'AttrList', + component: () => import('@/views/product/attr/list'), + meta: {title: '平台属性列表', noCache: true}, + hidden: true + }, + { + path: 'attr/add', + name: 'AttrAdd', + component: () => import('@/views/product/attr/form'), + meta: {title: '添加'}, + hidden: true + }, + { + path: 'attr/edit/:id', + name: 'AttrEdit', + component: () => import('@/views/product/attr/form'), + meta: {title: '编辑', noCache: true}, + hidden: true + }, + { + path: 'skuInfo/list', + name: 'SkuInfo', + component: () => import('@/views/product/skuInfo/list'), + meta: {title: 'SKU列表'} + }, + { + path: 'skuInfo/add', + name: 'SkuInfoAdd', + component: () => import('@/views/product/skuInfo/form'), + meta: {title: '添加'}, + hidden: true + }, + { + path: 'skuInfo/edit/:id', + name: 'SkuInfoEdit', + component: () => import('@/views/product/skuInfo/form'), + meta: {title: '编辑', noCache: true}, + hidden: true + } + ] + }, + + { + path: '/activity', + component: Layout, + redirect: '/activity/seckill', + name: 'Activity', + meta: {title: '营销活动管理', icon: 'dashboard'}, + alwaysShow: true, + children: [ + // { + // path: 'seckill/list', + // name: 'Seckill', + // component: () => import('@/views/activity/seckill/list'), + // meta: { title: '秒杀活动列表' } + // }, + // { + // path: 'seckill/timeList', + // name: 'SeckillTime', + // component: () => import('@/views/activity/seckill/timeList'), + // meta: { title: '秒杀时间段列表' }, + // hidden: true + // }, + // { + // path: 'seckill/selectTimeList', + // name: 'SelectSeckillTime', + // component: () => import('@/views/activity/seckill/selectTimeList'), + // meta: { title: '秒杀时间段选择' }, + // hidden: true + // }, + // { + // path: 'seckill/seckillSkuList', + // name: 'SeckillSku', + // component: () => import('@/views/activity/seckill/seckillSkuList'), + // meta: { title: '秒杀商品列表' }, + // hidden: true + // }, + + { + path: 'activityInfo/list', + name: 'ActivityInfo', + component: () => import('@/views/activity/activityInfo/list'), + meta: {title: '活动列表'} + }, + { + path: 'activityInfo/add', + name: 'ActivityInfoAdd', + component: () => import('@/views/activity/activityInfo/form'), + meta: {title: '添加'}, + hidden: true + }, + { + path: 'activityInfo/edit/:id', + name: 'ActivityInfoEdit', + component: () => import('@/views/activity/activityInfo/form'), + meta: {title: '编辑', noCache: true}, + hidden: true + }, + { + path: 'activityInfo/rule/:id', + name: 'ActivityInfoRule', + component: () => import('@/views/activity/activityInfo/rule'), + meta: {title: '规则', noCache: true}, + hidden: true + }, + { + path: 'couponInfo/list', + name: 'CouponInfo', + component: () => import('@/views/activity/couponInfo/list'), + meta: {title: '优惠券列表'} + }, + { + path: 'couponInfo/add', + name: 'CouponInfoAdd', + component: () => import('@/views/activity/couponInfo/form'), + meta: {title: '添加'}, + hidden: true + }, + { + path: 'couponInfo/edit/:id', + name: 'CouponInfoEdit', + component: () => import('@/views/activity/couponInfo/form'), + meta: {title: '编辑', noCache: true}, + hidden: true + }, + { + path: 'couponInfo/rule/:id', + name: 'CouponInfoRule', + component: () => import('@/views/activity/couponInfo/rule'), + meta: {title: '规则', noCache: true}, + hidden: true + } + ] + }, + + { + path: '/user', + component: Layout, + redirect: '/user/leader/list', + name: 'Leader', + meta: {title: '团长管理', icon: 'table'}, + alwaysShow: true, + children: [ + { + path: 'leader/checkList', + name: 'LeaderCheck', + component: () => import('@/views/user/leader/checkList'), + meta: {title: '团长待审核'} + }, + { + path: 'leader/list', + name: 'leader', + component: () => import('@/views/user/leader/list'), + meta: {title: '团长已审核'} + } + ] + }, + + { + name: 'Order', + path: '/order', + component: Layout, + redirect: '/order/orderInfo/list', + meta: {title: '订单管理', icon: 'table'}, + alwaysShow: true, + children: [ + { + path: 'orderInfo/list', + name: 'OrderInfo', + component: () => import('@/views/order/orderInfo/list'), + meta: {title: '订单列表'} + }, + { + path: 'orderInfo/show/:id', + name: 'OrderInfoShow', + component: () => import('@/views/order/orderInfo/show'), + meta: {title: '查看', noCache: true}, + hidden: true + }, + { + path: 'orderInfo/deliverList', + name: 'DetailList', + component: () => import('@/views/order/orderInfo/deliverList'), + meta: {title: '发货列表'} + } + ] + }, + + // 404 page must be placed at the end !!! + {path: '*', redirect: '/404', hidden: true} +] + +const createRouter = () => new Router({ + // mode: 'history', // require service support + scrollBehavior: () => ({y: 0}), + routes: constantRoutes +}) + +const router = createRouter() + +// Detail see: https://github.com/vuejs/vue-router/issues/1234#issuecomment-357941465 +export function resetRouter() { + const newRouter = createRouter() + router.matcher = newRouter.matcher // reset router +} + +export default router diff --git a/ssyx-admin/src/settings.js b/ssyx-admin/src/settings.js new file mode 100644 index 0000000..ae3c494 --- /dev/null +++ b/ssyx-admin/src/settings.js @@ -0,0 +1,16 @@ +module.exports = { + + title: 'Vue Admin Template', + + /** + * @type {boolean} true | false + * @description Whether fix the header + */ + fixedHeader: false, + + /** + * @type {boolean} true | false + * @description Whether show the logo in sidebar + */ + sidebarLogo: false +} diff --git a/ssyx-admin/src/store/getters.js b/ssyx-admin/src/store/getters.js new file mode 100644 index 0000000..5ab7b4c --- /dev/null +++ b/ssyx-admin/src/store/getters.js @@ -0,0 +1,8 @@ +const getters = { + sidebar: state => state.app.sidebar, + device: state => state.app.device, + token: state => state.user.token, + avatar: state => state.user.avatar, + name: state => state.user.name +} +export default getters diff --git a/ssyx-admin/src/store/index.js b/ssyx-admin/src/store/index.js new file mode 100644 index 0000000..6be466a --- /dev/null +++ b/ssyx-admin/src/store/index.js @@ -0,0 +1,19 @@ +import Vue from 'vue' +import Vuex from 'vuex' +import getters from './getters' +import app from './modules/app' +import settings from './modules/settings' +import user from './modules/user' + +Vue.use(Vuex) + +const store = new Vuex.Store({ + modules: { + app, + settings, + user + }, + getters +}) + +export default store diff --git a/ssyx-admin/src/store/modules/app.js b/ssyx-admin/src/store/modules/app.js new file mode 100644 index 0000000..21872ec --- /dev/null +++ b/ssyx-admin/src/store/modules/app.js @@ -0,0 +1,48 @@ +import Cookies from 'js-cookie' + +const state = { + sidebar: { + opened: Cookies.get('sidebarStatus') ? !!+Cookies.get('sidebarStatus') : true, + withoutAnimation: false + }, + device: 'desktop' +} + +const mutations = { + TOGGLE_SIDEBAR: state => { + state.sidebar.opened = !state.sidebar.opened + state.sidebar.withoutAnimation = false + if (state.sidebar.opened) { + Cookies.set('sidebarStatus', 1) + } else { + Cookies.set('sidebarStatus', 0) + } + }, + CLOSE_SIDEBAR: (state, withoutAnimation) => { + Cookies.set('sidebarStatus', 0) + state.sidebar.opened = false + state.sidebar.withoutAnimation = withoutAnimation + }, + TOGGLE_DEVICE: (state, device) => { + state.device = device + } +} + +const actions = { + toggleSideBar({commit}) { + commit('TOGGLE_SIDEBAR') + }, + closeSideBar({commit}, {withoutAnimation}) { + commit('CLOSE_SIDEBAR', withoutAnimation) + }, + toggleDevice({commit}, device) { + commit('TOGGLE_DEVICE', device) + } +} + +export default { + namespaced: true, + state, + mutations, + actions +} diff --git a/ssyx-admin/src/store/modules/settings.js b/ssyx-admin/src/store/modules/settings.js new file mode 100644 index 0000000..e5c456d --- /dev/null +++ b/ssyx-admin/src/store/modules/settings.js @@ -0,0 +1,32 @@ +import defaultSettings from '@/settings' + +const {showSettings, fixedHeader, sidebarLogo} = defaultSettings + +const state = { + showSettings: showSettings, + fixedHeader: fixedHeader, + sidebarLogo: sidebarLogo +} + +const mutations = { + CHANGE_SETTING: (state, {key, value}) => { + // eslint-disable-next-line no-prototype-builtins + if (state.hasOwnProperty(key)) { + state[key] = value + } + } +} + +const actions = { + changeSetting({commit}, data) { + commit('CHANGE_SETTING', data) + } +} + +export default { + namespaced: true, + state, + mutations, + actions +} + diff --git a/ssyx-admin/src/store/modules/user.js b/ssyx-admin/src/store/modules/user.js new file mode 100644 index 0000000..619eed9 --- /dev/null +++ b/ssyx-admin/src/store/modules/user.js @@ -0,0 +1,97 @@ +import {login, logout, getInfo} from '@/api/user' +import {getToken, setToken, removeToken} from '@/utils/auth' +import {resetRouter} from '@/router' + +const getDefaultState = () => { + return { + token: getToken(), + name: '', + avatar: '' + } +} + +const state = getDefaultState() + +const mutations = { + RESET_STATE: (state) => { + Object.assign(state, getDefaultState()) + }, + SET_TOKEN: (state, token) => { + state.token = token + }, + SET_NAME: (state, name) => { + state.name = name + }, + SET_AVATAR: (state, avatar) => { + state.avatar = avatar + } +} + +const actions = { + // user login + login({commit}, userInfo) { + const {username, password} = userInfo + return new Promise((resolve, reject) => { + login({username: username.trim(), password: password}).then(response => { + const {data} = response + commit('SET_TOKEN', data.token) + setToken(data.token) + resolve() + }).catch(error => { + reject(error) + }) + }) + }, + + // get user info + getInfo({commit, state}) { + return new Promise((resolve, reject) => { + getInfo(state.token).then(response => { + const {data} = response + + if (!data) { + return reject('Verification failed, please Login again.') + } + + const {name, avatar} = data + + commit('SET_NAME', name) + commit('SET_AVATAR', avatar) + resolve(data) + }).catch(error => { + reject(error) + }) + }) + }, + + // user logout + logout({commit, state}) { + return new Promise((resolve, reject) => { + logout(state.token).then(() => { + removeToken() // must remove token first + resetRouter() + commit('RESET_STATE') + resolve() + }).catch(error => { + reject(error) + }) + }) + }, + + // remove token + resetToken({commit}) { + return new Promise(resolve => { + removeToken() // must remove token first + commit('RESET_STATE') + resolve() + }) + } +} + +export default { + namespaced: true, + state, + mutations, + actions +} + diff --git a/ssyx-admin/src/styles/element-ui.scss b/ssyx-admin/src/styles/element-ui.scss new file mode 100644 index 0000000..0062411 --- /dev/null +++ b/ssyx-admin/src/styles/element-ui.scss @@ -0,0 +1,49 @@ +// cover some element-ui styles + +.el-breadcrumb__inner, +.el-breadcrumb__inner a { + font-weight: 400 !important; +} + +.el-upload { + input[type="file"] { + display: none !important; + } +} + +.el-upload__input { + display: none; +} + + +// to fixed https://github.com/ElemeFE/element/issues/2461 +.el-dialog { + transform: none; + left: 0; + position: relative; + margin: 0 auto; +} + +// refine element ui upload +.upload-container { + .el-upload { + width: 100%; + + .el-upload-dragger { + width: 100%; + height: 200px; + } + } +} + +// dropdown +.el-dropdown-menu { + a { + display: block + } +} + +// to fix el-date-picker css style +.el-range-separator { + box-sizing: content-box; +} diff --git a/ssyx-admin/src/styles/index.scss b/ssyx-admin/src/styles/index.scss new file mode 100644 index 0000000..3b4da51 --- /dev/null +++ b/ssyx-admin/src/styles/index.scss @@ -0,0 +1,65 @@ +@import './variables.scss'; +@import './mixin.scss'; +@import './transition.scss'; +@import './element-ui.scss'; +@import './sidebar.scss'; + +body { + height: 100%; + -moz-osx-font-smoothing: grayscale; + -webkit-font-smoothing: antialiased; + text-rendering: optimizeLegibility; + font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif; +} + +label { + font-weight: 700; +} + +html { + height: 100%; + box-sizing: border-box; +} + +#app { + height: 100%; +} + +*, +*:before, +*:after { + box-sizing: inherit; +} + +a:focus, +a:active { + outline: none; +} + +a, +a:focus, +a:hover { + cursor: pointer; + color: inherit; + text-decoration: none; +} + +div:focus { + outline: none; +} + +.clearfix { + &:after { + visibility: hidden; + display: block; + font-size: 0; + content: " "; + clear: both; + height: 0; + } +} + +// main-container global css +.app-container { + padding: 20px; +} diff --git a/ssyx-admin/src/styles/mixin.scss b/ssyx-admin/src/styles/mixin.scss new file mode 100644 index 0000000..36b74bb --- /dev/null +++ b/ssyx-admin/src/styles/mixin.scss @@ -0,0 +1,28 @@ +@mixin clearfix { + &:after { + content: ""; + display: table; + clear: both; + } +} + +@mixin scrollBar { + &::-webkit-scrollbar-track-piece { + background: #d3dce6; + } + + &::-webkit-scrollbar { + width: 6px; + } + + &::-webkit-scrollbar-thumb { + background: #99a9bf; + border-radius: 20px; + } +} + +@mixin relative { + position: relative; + width: 100%; + height: 100%; +} diff --git a/ssyx-admin/src/styles/sidebar.scss b/ssyx-admin/src/styles/sidebar.scss new file mode 100644 index 0000000..85a04a5 --- /dev/null +++ b/ssyx-admin/src/styles/sidebar.scss @@ -0,0 +1,227 @@ +#app { + + .main-container { + min-height: 100%; + transition: margin-left .28s; + margin-left: $sideBarWidth; + position: relative; + } + + .sidebar-container { + transition: width 0.28s; + width: $sideBarWidth !important; + background-color: $menuBg; + height: 100%; + position: fixed; + font-size: 0px; + top: 0; + bottom: 0; + left: 0; + z-index: 1001; + overflow: hidden; + + // reset element-ui css + .horizontal-collapse-transition { + transition: 0s width ease-in-out, 0s padding-left ease-in-out, 0s padding-right ease-in-out; + } + + .scrollbar-wrapper { + overflow-x: hidden !important; + } + + .el-scrollbar__bar.is-vertical { + right: 0px; + } + + .el-scrollbar { + height: 100%; + } + + &.has-logo { + .el-scrollbar { + height: calc(100% - 50px); + } + } + + .is-horizontal { + display: none; + } + + a { + display: inline-block; + width: 100%; + overflow: hidden; + } + + .svg-icon { + margin-right: 16px; + } + + .sub-el-icon { + margin-right: 12px; + margin-left: -2px; + } + + .el-menu { + border: none; + height: 100%; + width: 100% !important; + } + + // menu hover + .submenu-title-noDropdown, + .el-submenu__title { + &:hover { + background-color: $menuHover !important; + } + } + + .is-active > .el-submenu__title { + color: $subMenuActiveText !important; + } + + & .nest-menu .el-submenu > .el-submenu__title, + & .el-submenu .el-menu-item { + min-width: $sideBarWidth !important; + background-color: $subMenuBg !important; + + &:hover { + background-color: $subMenuHover !important; + } + } + } + + .hideSidebar { + .sidebar-container { + width: 54px !important; + } + + .main-container { + margin-left: 54px; + } + + .submenu-title-noDropdown { + padding: 0 !important; + position: relative; + + .el-tooltip { + padding: 0 !important; + + .svg-icon { + margin-left: 20px; + } + + .sub-el-icon { + margin-left: 19px; + } + } + } + + .el-submenu { + overflow: hidden; + + & > .el-submenu__title { + padding: 0 !important; + + .svg-icon { + margin-left: 20px; + } + + .sub-el-icon { + margin-left: 19px; + } + + .el-submenu__icon-arrow { + display: none; + } + } + } + + .el-menu--collapse { + .el-submenu { + & > .el-submenu__title { + & > span { + height: 0; + width: 0; + overflow: hidden; + visibility: hidden; + display: inline-block; + } + } + } + } + } + + .el-menu--collapse .el-menu .el-submenu { + min-width: $sideBarWidth !important; + } + + // mobile responsive + .mobile { + .main-container { + margin-left: 0px; + } + + .sidebar-container { + transition: transform .28s; + width: $sideBarWidth !important; + } + + &.hideSidebar { + .sidebar-container { + pointer-events: none; + transition-duration: 0.3s; + transform: translate3d(-$sideBarWidth, 0, 0); + } + } + } + + .withoutAnimation { + + .main-container, + .sidebar-container { + transition: none; + } + } +} + +// when menu collapsed +.el-menu--vertical { + & > .el-menu { + .svg-icon { + margin-right: 16px; + } + + .sub-el-icon { + margin-right: 12px; + margin-left: -2px; + } + } + + .nest-menu .el-submenu > .el-submenu__title, + .el-menu-item { + &:hover { + // you can use $subMenuHover + background-color: $menuHover !important; + } + } + + // the scroll bar appears when the subMenu is too long + > .el-menu--popup { + max-height: 100vh; + overflow-y: auto; + + &::-webkit-scrollbar-track-piece { + background: #d3dce6; + } + + &::-webkit-scrollbar { + width: 6px; + } + + &::-webkit-scrollbar-thumb { + background: #99a9bf; + border-radius: 20px; + } + } +} diff --git a/ssyx-admin/src/styles/transition.scss b/ssyx-admin/src/styles/transition.scss new file mode 100644 index 0000000..4cb27cc --- /dev/null +++ b/ssyx-admin/src/styles/transition.scss @@ -0,0 +1,48 @@ +// global transition css + +/* fade */ +.fade-enter-active, +.fade-leave-active { + transition: opacity 0.28s; +} + +.fade-enter, +.fade-leave-active { + opacity: 0; +} + +/* fade-transform */ +.fade-transform-leave-active, +.fade-transform-enter-active { + transition: all .5s; +} + +.fade-transform-enter { + opacity: 0; + transform: translateX(-30px); +} + +.fade-transform-leave-to { + opacity: 0; + transform: translateX(30px); +} + +/* breadcrumb transition */ +.breadcrumb-enter-active, +.breadcrumb-leave-active { + transition: all .5s; +} + +.breadcrumb-enter, +.breadcrumb-leave-active { + opacity: 0; + transform: translateX(20px); +} + +.breadcrumb-move { + transition: all .5s; +} + +.breadcrumb-leave-active { + position: absolute; +} diff --git a/ssyx-admin/src/styles/variables.scss b/ssyx-admin/src/styles/variables.scss new file mode 100644 index 0000000..09a2e2b --- /dev/null +++ b/ssyx-admin/src/styles/variables.scss @@ -0,0 +1,25 @@ +// sidebar +$menuText: #bfcbd9; +$menuActiveText: #409EFF; +$subMenuActiveText: #f4f4f5; //https://github.com/ElemeFE/element/issues/12951 + +$menuBg: #304156; +$menuHover: #263445; + +$subMenuBg: #1f2d3d; +$subMenuHover: #001528; + +$sideBarWidth: 210px; + +// the :export directive is the magic sauce for webpack +// https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass +:export { + menuText: $menuText; + menuActiveText: $menuActiveText; + subMenuActiveText: $subMenuActiveText; + menuBg: $menuBg; + menuHover: $menuHover; + subMenuBg: $subMenuBg; + subMenuHover: $subMenuHover; + sideBarWidth: $sideBarWidth; +} diff --git a/ssyx-admin/src/utils/auth.js b/ssyx-admin/src/utils/auth.js new file mode 100644 index 0000000..059af18 --- /dev/null +++ b/ssyx-admin/src/utils/auth.js @@ -0,0 +1,15 @@ +import Cookies from 'js-cookie' + +const TokenKey = 'vue_admin_template_token' + +export function getToken() { + return Cookies.get(TokenKey) +} + +export function setToken(token) { + return Cookies.set(TokenKey, token) +} + +export function removeToken() { + return Cookies.remove(TokenKey) +} diff --git a/ssyx-admin/src/utils/btn-permission.js b/ssyx-admin/src/utils/btn-permission.js new file mode 100644 index 0000000..2722b8c --- /dev/null +++ b/ssyx-admin/src/utils/btn-permission.js @@ -0,0 +1,12 @@ +import store from '@/store' + +/** + * 判断当前用户是否有此按钮权限 + * @param {按钮权限字符串} permission + */ +export default function hasBtnPermission(permission) { + // 得到当前用户的所有按钮权限 + const myBtns = store.getters.buttons + // 如果指定的功能权限在myBtns中, 返回true ==> 这个按钮就会显示, 否则隐藏 + return myBtns.indexOf(permission) !== -1 +} diff --git a/ssyx-admin/src/utils/get-page-title.js b/ssyx-admin/src/utils/get-page-title.js new file mode 100644 index 0000000..a6de99d --- /dev/null +++ b/ssyx-admin/src/utils/get-page-title.js @@ -0,0 +1,10 @@ +import defaultSettings from '@/settings' + +const title = defaultSettings.title || 'Vue Admin Template' + +export default function getPageTitle(pageTitle) { + if (pageTitle) { + return `${pageTitle} - ${title}` + } + return `${title}` +} diff --git a/ssyx-admin/src/utils/index.js b/ssyx-admin/src/utils/index.js new file mode 100644 index 0000000..7e384aa --- /dev/null +++ b/ssyx-admin/src/utils/index.js @@ -0,0 +1,119 @@ +/** + * Created by PanJiaChen on 16/11/18. + */ + +/** + * Parse the time to string + * @param {(Object|string|number)} time + * @param {string} cFormat + * @returns {string | null} + */ +export function parseTime(time, cFormat) { + if (arguments.length === 0 || !time) { + return null + } + const format = cFormat || '{y}-{m}-{d} {h}:{i}:{s}' + let date + if (typeof time === 'object') { + date = time + } else { + if ((typeof time === 'string')) { + if ((/^[0-9]+$/.test(time))) { + // support "1548221490638" + time = parseInt(time) + } else { + // support safari + // https://stackoverflow.com/questions/4310953/invalid-date-in-safari + time = time.replace(new RegExp(/-/gm), '/') + } + } + + if ((typeof time === 'number') && (time.toString().length === 10)) { + time = time * 1000 + } + date = new Date(time) + } + const formatObj = { + y: date.getFullYear(), + m: date.getMonth() + 1, + d: date.getDate(), + h: date.getHours(), + i: date.getMinutes(), + s: date.getSeconds(), + a: date.getDay() + } + const time_str = format.replace(/{([ymdhisa])+}/g, (result, key) => { + const value = formatObj[key] + // Note: getDay() returns 0 on Sunday + if (key === 'a') { + return ['日', '一', '二', '三', '四', '五', '六'][value] + } + return value.toString().padStart(2, '0') + }) + return time_str +} + +/** + * @param {number} time + * @param {string} option + * @returns {string} + */ +export function formatTime(time, option) { + if (('' + time).length === 10) { + time = parseInt(time) * 1000 + } else { + time = +time + } + const d = new Date(time) + const now = Date.now() + + const diff = (now - d) / 1000 + + if (diff < 30) { + return '刚刚' + } else if (diff < 3600) { + // less 1 hour + return Math.ceil(diff / 60) + '分钟前' + } else if (diff < 3600 * 24) { + return Math.ceil(diff / 3600) + '小时前' + } else if (diff < 3600 * 24 * 2) { + return '1天前' + } + if (option) { + return parseTime(time, option) + } else { + return ( + d.getMonth() + + 1 + + '月' + + d.getDate() + + '日' + + d.getHours() + + '时' + + d.getMinutes() + + '分' + ) + } +} + +/** + * @param {string} url + * @returns {Object} + */ +export function param2Obj(url) { + const search = decodeURIComponent(url.split('?')[1]).replace(/\+/g, ' ') + if (!search) { + return {} + } + const obj = {} + const searchArr = search.split('&') + searchArr.forEach(v => { + const index = v.indexOf('=') + if (index !== -1) { + const name = v.substring(0, index) + const val = v.substring(index + 1, v.length) + obj[name] = val + } + }) + return obj +} diff --git a/ssyx-admin/src/utils/request.js b/ssyx-admin/src/utils/request.js new file mode 100644 index 0000000..61ece2d --- /dev/null +++ b/ssyx-admin/src/utils/request.js @@ -0,0 +1,85 @@ +import axios from 'axios' +import {MessageBox, Message} from 'element-ui' +import store from '@/store' +import {getToken} from '@/utils/auth' + +// create an axios instance +const service = axios.create({ + baseURL: process.env.VUE_APP_BASE_API, // url = base url + request url + // withCredentials: true, // send cookies when cross-domain requests + timeout: 5000 // request timeout +}) + +// request interceptor +service.interceptors.request.use( + config => { + // do something before request is sent + + if (store.getters.token) { + // let each request carry token + // ['X-Token'] is a custom headers key + // please modify it according to the actual situation + config.headers['token'] = getToken() + } + return config + }, + error => { + // do something with request error + console.log(error) // for debug + return Promise.reject(error) + } +) + +// response interceptor +service.interceptors.response.use( + /** + * If you want to get http information such as headers or status + * Please return response => response + */ + + /** + * Determine the request status by custom code + * Here is just an example + * You can also judge the status by HTTP Status Code + */ + response => { + const res = response.data + + // if the custom code is not 20000, it is judged as an error. + if (res.code !== 200) { + Message({ + message: res.message || 'Error', + type: 'error', + duration: 5 * 1000 + }) + + // 50008: Illegal token; 50012: Other clients logged in; 50014: Token expired; + if (res.code === 50008 || res.code === 50012 || res.code === 50014) { + // to re-login + MessageBox.confirm('You have been logged out, you can cancel to stay on this page, or log in again', 'Confirm logout', { + confirmButtonText: 'Re-Login', + cancelButtonText: 'Cancel', + type: 'warning' + }).then(() => { + store.dispatch('user/resetToken').then(() => { + location.reload() + }) + }) + } + return Promise.reject(new Error(res.message || 'Error')) + } else { + return res + } + }, + error => { + console.log('err' + error) // for debug + Message({ + message: error.message, + type: 'error', + duration: 5 * 1000 + }) + return Promise.reject(error) + } +) + +export default service diff --git a/ssyx-admin/src/utils/validate.js b/ssyx-admin/src/utils/validate.js new file mode 100644 index 0000000..8d962ad --- /dev/null +++ b/ssyx-admin/src/utils/validate.js @@ -0,0 +1,20 @@ +/** + * Created by PanJiaChen on 16/11/18. + */ + +/** + * @param {string} path + * @returns {Boolean} + */ +export function isExternal(path) { + return /^(https?:|mailto:|tel:)/.test(path) +} + +/** + * @param {string} str + * @returns {Boolean} + */ +export function validUsername(str) { + const valid_map = ['admin', 'editor'] + return valid_map.indexOf(str.trim()) >= 0 +} diff --git a/ssyx-admin/src/views/404.vue b/ssyx-admin/src/views/404.vue new file mode 100644 index 0000000..8f4c2e0 --- /dev/null +++ b/ssyx-admin/src/views/404.vue @@ -0,0 +1,244 @@ + + + + + diff --git a/ssyx-admin/src/views/acl/permission/list.vue b/ssyx-admin/src/views/acl/permission/list.vue new file mode 100644 index 0000000..fb7b7de --- /dev/null +++ b/ssyx-admin/src/views/acl/permission/list.vue @@ -0,0 +1,280 @@ + + + diff --git a/ssyx-admin/src/views/acl/role/list.vue b/ssyx-admin/src/views/acl/role/list.vue new file mode 100644 index 0000000..2e100a9 --- /dev/null +++ b/ssyx-admin/src/views/acl/role/list.vue @@ -0,0 +1,294 @@ + + + + + diff --git a/ssyx-admin/src/views/acl/role/roleAuth.vue b/ssyx-admin/src/views/acl/role/roleAuth.vue new file mode 100644 index 0000000..e924583 --- /dev/null +++ b/ssyx-admin/src/views/acl/role/roleAuth.vue @@ -0,0 +1,108 @@ + + diff --git a/ssyx-admin/src/views/acl/user/list.vue b/ssyx-admin/src/views/acl/user/list.vue new file mode 100644 index 0000000..a359bca --- /dev/null +++ b/ssyx-admin/src/views/acl/user/list.vue @@ -0,0 +1,372 @@ + + + diff --git a/ssyx-admin/src/views/activity/activityInfo/form.vue b/ssyx-admin/src/views/activity/activityInfo/form.vue new file mode 100644 index 0000000..6e68a13 --- /dev/null +++ b/ssyx-admin/src/views/activity/activityInfo/form.vue @@ -0,0 +1,139 @@ + + + diff --git a/ssyx-admin/src/views/activity/activityInfo/list.vue b/ssyx-admin/src/views/activity/activityInfo/list.vue new file mode 100644 index 0000000..28a7147 --- /dev/null +++ b/ssyx-admin/src/views/activity/activityInfo/list.vue @@ -0,0 +1,157 @@ + + + + diff --git a/ssyx-admin/src/views/activity/activityInfo/rule.vue b/ssyx-admin/src/views/activity/activityInfo/rule.vue new file mode 100644 index 0000000..f4875c7 --- /dev/null +++ b/ssyx-admin/src/views/activity/activityInfo/rule.vue @@ -0,0 +1,319 @@ + + + + diff --git a/ssyx-admin/src/views/activity/couponInfo/form.vue b/ssyx-admin/src/views/activity/couponInfo/form.vue new file mode 100644 index 0000000..3677195 --- /dev/null +++ b/ssyx-admin/src/views/activity/couponInfo/form.vue @@ -0,0 +1,163 @@ + + + diff --git a/ssyx-admin/src/views/activity/couponInfo/list.vue b/ssyx-admin/src/views/activity/couponInfo/list.vue new file mode 100644 index 0000000..a15ad75 --- /dev/null +++ b/ssyx-admin/src/views/activity/couponInfo/list.vue @@ -0,0 +1,164 @@ + + + + diff --git a/ssyx-admin/src/views/activity/couponInfo/rule.vue b/ssyx-admin/src/views/activity/couponInfo/rule.vue new file mode 100644 index 0000000..dc87ced --- /dev/null +++ b/ssyx-admin/src/views/activity/couponInfo/rule.vue @@ -0,0 +1,355 @@ + + + + diff --git a/ssyx-admin/src/views/activity/seckill/list.vue b/ssyx-admin/src/views/activity/seckill/list.vue new file mode 100644 index 0000000..f874f65 --- /dev/null +++ b/ssyx-admin/src/views/activity/seckill/list.vue @@ -0,0 +1,286 @@ + + + + diff --git a/ssyx-admin/src/views/activity/seckill/seckillSkuList.vue b/ssyx-admin/src/views/activity/seckill/seckillSkuList.vue new file mode 100644 index 0000000..59f8ad3 --- /dev/null +++ b/ssyx-admin/src/views/activity/seckill/seckillSkuList.vue @@ -0,0 +1,344 @@ + + + + diff --git a/ssyx-admin/src/views/activity/seckill/selectTimeList.vue b/ssyx-admin/src/views/activity/seckill/selectTimeList.vue new file mode 100644 index 0000000..01ecc17 --- /dev/null +++ b/ssyx-admin/src/views/activity/seckill/selectTimeList.vue @@ -0,0 +1,102 @@ + + + + diff --git a/ssyx-admin/src/views/activity/seckill/timeList.vue b/ssyx-admin/src/views/activity/seckill/timeList.vue new file mode 100644 index 0000000..d9e4d46 --- /dev/null +++ b/ssyx-admin/src/views/activity/seckill/timeList.vue @@ -0,0 +1,247 @@ + + + + diff --git a/ssyx-admin/src/views/dashboard/index.vue b/ssyx-admin/src/views/dashboard/index.vue new file mode 100644 index 0000000..89fd1a5 --- /dev/null +++ b/ssyx-admin/src/views/dashboard/index.vue @@ -0,0 +1,31 @@ + + + + + diff --git a/ssyx-admin/src/views/login/index.vue b/ssyx-admin/src/views/login/index.vue new file mode 100644 index 0000000..1855a91 --- /dev/null +++ b/ssyx-admin/src/views/login/index.vue @@ -0,0 +1,240 @@ + + + + + + + diff --git a/ssyx-admin/src/views/order/orderInfo/deliverList.vue b/ssyx-admin/src/views/order/orderInfo/deliverList.vue new file mode 100644 index 0000000..0998b1e --- /dev/null +++ b/ssyx-admin/src/views/order/orderInfo/deliverList.vue @@ -0,0 +1,231 @@ + + + diff --git a/ssyx-admin/src/views/order/orderInfo/list.vue b/ssyx-admin/src/views/order/orderInfo/list.vue new file mode 100644 index 0000000..a016a92 --- /dev/null +++ b/ssyx-admin/src/views/order/orderInfo/list.vue @@ -0,0 +1,260 @@ + + + diff --git a/ssyx-admin/src/views/order/orderInfo/show.vue b/ssyx-admin/src/views/order/orderInfo/show.vue new file mode 100644 index 0000000..3d343db --- /dev/null +++ b/ssyx-admin/src/views/order/orderInfo/show.vue @@ -0,0 +1,139 @@ + + + diff --git a/ssyx-admin/src/views/product/attr/form.vue b/ssyx-admin/src/views/product/attr/form.vue new file mode 100644 index 0000000..5e9bb55 --- /dev/null +++ b/ssyx-admin/src/views/product/attr/form.vue @@ -0,0 +1,127 @@ + + + diff --git a/ssyx-admin/src/views/product/attr/list.vue b/ssyx-admin/src/views/product/attr/list.vue new file mode 100644 index 0000000..f2190c3 --- /dev/null +++ b/ssyx-admin/src/views/product/attr/list.vue @@ -0,0 +1,187 @@ + + + + diff --git a/ssyx-admin/src/views/product/attrGroup/form.vue b/ssyx-admin/src/views/product/attrGroup/form.vue new file mode 100644 index 0000000..019c2a8 --- /dev/null +++ b/ssyx-admin/src/views/product/attrGroup/form.vue @@ -0,0 +1,122 @@ + + + diff --git a/ssyx-admin/src/views/product/attrGroup/list.vue b/ssyx-admin/src/views/product/attrGroup/list.vue new file mode 100644 index 0000000..6544b9a --- /dev/null +++ b/ssyx-admin/src/views/product/attrGroup/list.vue @@ -0,0 +1,228 @@ + + + + diff --git a/ssyx-admin/src/views/product/category/form.vue b/ssyx-admin/src/views/product/category/form.vue new file mode 100644 index 0000000..3426d82 --- /dev/null +++ b/ssyx-admin/src/views/product/category/form.vue @@ -0,0 +1,140 @@ + + + diff --git a/ssyx-admin/src/views/product/category/list.vue b/ssyx-admin/src/views/product/category/list.vue new file mode 100644 index 0000000..77a7e90 --- /dev/null +++ b/ssyx-admin/src/views/product/category/list.vue @@ -0,0 +1,219 @@ + + + + diff --git a/ssyx-admin/src/views/product/skuInfo/form.vue b/ssyx-admin/src/views/product/skuInfo/form.vue new file mode 100644 index 0000000..3024a11 --- /dev/null +++ b/ssyx-admin/src/views/product/skuInfo/form.vue @@ -0,0 +1,429 @@ + + + + diff --git a/ssyx-admin/src/views/product/skuInfo/list.vue b/ssyx-admin/src/views/product/skuInfo/list.vue new file mode 100644 index 0000000..4b74404 --- /dev/null +++ b/ssyx-admin/src/views/product/skuInfo/list.vue @@ -0,0 +1,331 @@ + + + + diff --git a/ssyx-admin/src/views/sys/regionWare/list.vue b/ssyx-admin/src/views/sys/regionWare/list.vue new file mode 100644 index 0000000..f1d1991 --- /dev/null +++ b/ssyx-admin/src/views/sys/regionWare/list.vue @@ -0,0 +1,264 @@ + + + diff --git a/ssyx-admin/src/views/user/leader/checkList.vue b/ssyx-admin/src/views/user/leader/checkList.vue new file mode 100644 index 0000000..2cf3061 --- /dev/null +++ b/ssyx-admin/src/views/user/leader/checkList.vue @@ -0,0 +1,358 @@ + + + + diff --git a/ssyx-admin/src/views/user/leader/list.vue b/ssyx-admin/src/views/user/leader/list.vue new file mode 100644 index 0000000..fea9d90 --- /dev/null +++ b/ssyx-admin/src/views/user/leader/list.vue @@ -0,0 +1,142 @@ + + + + diff --git a/ssyx-admin/tests/unit/.eslintrc.js b/ssyx-admin/tests/unit/.eslintrc.js new file mode 100644 index 0000000..958d51b --- /dev/null +++ b/ssyx-admin/tests/unit/.eslintrc.js @@ -0,0 +1,5 @@ +module.exports = { + env: { + jest: true + } +} diff --git a/ssyx-admin/tests/unit/components/Breadcrumb.spec.js b/ssyx-admin/tests/unit/components/Breadcrumb.spec.js new file mode 100644 index 0000000..c8e2acd --- /dev/null +++ b/ssyx-admin/tests/unit/components/Breadcrumb.spec.js @@ -0,0 +1,98 @@ +import {mount, createLocalVue} from '@vue/test-utils' +import VueRouter from 'vue-router' +import ElementUI from 'element-ui' +import Breadcrumb from '@/components/Breadcrumb/index.vue' + +const localVue = createLocalVue() +localVue.use(VueRouter) +localVue.use(ElementUI) + +const routes = [ + { + path: '/', + name: 'home', + children: [{ + path: 'dashboard', + name: 'dashboard' + }] + }, + { + path: '/menu', + name: 'menu', + children: [{ + path: 'menu1', + name: 'menu1', + meta: {title: 'menu1'}, + children: [{ + path: 'menu1-1', + name: 'menu1-1', + meta: {title: 'menu1-1'} + }, + { + path: 'menu1-2', + name: 'menu1-2', + redirect: 'noredirect', + meta: {title: 'menu1-2'}, + children: [{ + path: 'menu1-2-1', + name: 'menu1-2-1', + meta: {title: 'menu1-2-1'} + }, + { + path: 'menu1-2-2', + name: 'menu1-2-2' + }] + }] + }] + }] + +const router = new VueRouter({ + routes +}) + +describe('Breadcrumb.vue', () => { + const wrapper = mount(Breadcrumb, { + localVue, + router + }) + it('dashboard', () => { + router.push('/dashboard') + const len = wrapper.findAll('.el-breadcrumb__inner').length + expect(len).toBe(1) + }) + it('normal route', () => { + router.push('/menu/menu1') + const len = wrapper.findAll('.el-breadcrumb__inner').length + expect(len).toBe(2) + }) + it('nested route', () => { + router.push('/menu/menu1/menu1-2/menu1-2-1') + const len = wrapper.findAll('.el-breadcrumb__inner').length + expect(len).toBe(4) + }) + it('no meta.title', () => { + router.push('/menu/menu1/menu1-2/menu1-2-2') + const len = wrapper.findAll('.el-breadcrumb__inner').length + expect(len).toBe(3) + }) + // it('click link', () => { + // router.push('/menu/menu1/menu1-2/menu1-2-2') + // const breadcrumbArray = wrapper.findAll('.el-breadcrumb__inner') + // const second = breadcrumbArray.at(1) + // console.log(breadcrumbArray) + // const href = second.find('a').attributes().href + // expect(href).toBe('#/menu/menu1') + // }) + // it('noRedirect', () => { + // router.push('/menu/menu1/menu1-2/menu1-2-1') + // const breadcrumbArray = wrapper.findAll('.el-breadcrumb__inner') + // const redirectBreadcrumb = breadcrumbArray.at(2) + // expect(redirectBreadcrumb.contains('a')).toBe(false) + // }) + it('last breadcrumb', () => { + router.push('/menu/menu1/menu1-2/menu1-2-1') + const breadcrumbArray = wrapper.findAll('.el-breadcrumb__inner') + const redirectBreadcrumb = breadcrumbArray.at(3) + expect(redirectBreadcrumb.contains('a')).toBe(false) + }) +}) diff --git a/ssyx-admin/tests/unit/components/Hamburger.spec.js b/ssyx-admin/tests/unit/components/Hamburger.spec.js new file mode 100644 index 0000000..95fa056 --- /dev/null +++ b/ssyx-admin/tests/unit/components/Hamburger.spec.js @@ -0,0 +1,19 @@ +import {shallowMount} from '@vue/test-utils' +import Hamburger from '@/components/Hamburger/index.vue' + +describe('Hamburger.vue', () => { + it('toggle click', () => { + const wrapper = shallowMount(Hamburger) + const mockFn = jest.fn() + wrapper.vm.$on('toggleClick', mockFn) + wrapper.find('.hamburger').trigger('click') + expect(mockFn).toBeCalled() + }) + it('prop isActive', () => { + const wrapper = shallowMount(Hamburger) + wrapper.setProps({isActive: true}) + expect(wrapper.contains('.is-active')).toBe(true) + wrapper.setProps({isActive: false}) + expect(wrapper.contains('.is-active')).toBe(false) + }) +}) diff --git a/ssyx-admin/tests/unit/components/SvgIcon.spec.js b/ssyx-admin/tests/unit/components/SvgIcon.spec.js new file mode 100644 index 0000000..57ca8a9 --- /dev/null +++ b/ssyx-admin/tests/unit/components/SvgIcon.spec.js @@ -0,0 +1,23 @@ +import {shallowMount} from '@vue/test-utils' +import SvgIcon from '@/components/SvgIcon/index.vue' + +describe('SvgIcon.vue', () => { + it('iconClass', () => { + const wrapper = shallowMount(SvgIcon, { + propsData: { + iconClass: 'test' + } + }) + expect(wrapper.find('use').attributes().href).toBe('#icon-test') + }) + it('className', () => { + const wrapper = shallowMount(SvgIcon, { + propsData: { + iconClass: 'test' + } + }) + expect(wrapper.classes().length).toBe(1) + wrapper.setProps({className: 'test'}) + expect(wrapper.classes().includes('test')).toBe(true) + }) +}) diff --git a/ssyx-admin/tests/unit/utils/formatTime.spec.js b/ssyx-admin/tests/unit/utils/formatTime.spec.js new file mode 100644 index 0000000..9968bf3 --- /dev/null +++ b/ssyx-admin/tests/unit/utils/formatTime.spec.js @@ -0,0 +1,30 @@ +import {formatTime} from '@/utils/index.js' + +describe('Utils:formatTime', () => { + const d = new Date('2018-07-13 17:54:01') // "2018-07-13 17:54:01" + const retrofit = 5 * 1000 + + it('ten digits timestamp', () => { + expect(formatTime((d / 1000).toFixed(0))).toBe('7月13日17时54分') + }) + it('test now', () => { + expect(formatTime(+new Date() - 1)).toBe('刚刚') + }) + it('less two minute', () => { + expect(formatTime(+new Date() - 60 * 2 * 1000 + retrofit)).toBe('2分钟前') + }) + it('less two hour', () => { + expect(formatTime(+new Date() - 60 * 60 * 2 * 1000 + retrofit)).toBe('2小时前') + }) + it('less one day', () => { + expect(formatTime(+new Date() - 60 * 60 * 24 * 1 * 1000)).toBe('1天前') + }) + it('more than one day', () => { + expect(formatTime(d)).toBe('7月13日17时54分') + }) + it('format', () => { + expect(formatTime(d, '{y}-{m}-{d} {h}:{i}')).toBe('2018-07-13 17:54') + expect(formatTime(d, '{y}-{m}-{d}')).toBe('2018-07-13') + expect(formatTime(d, '{y}/{m}/{d} {h}-{i}')).toBe('2018/07/13 17-54') + }) +}) diff --git a/ssyx-admin/tests/unit/utils/param2Obj.spec.js b/ssyx-admin/tests/unit/utils/param2Obj.spec.js new file mode 100644 index 0000000..3e7de4d --- /dev/null +++ b/ssyx-admin/tests/unit/utils/param2Obj.spec.js @@ -0,0 +1,15 @@ +import {param2Obj} from '@/utils/index.js' + +describe('Utils:param2Obj', () => { + const url = 'https://github.com/PanJiaChen/vue-element-admin?name=bill&age=29&sex=1&field=dGVzdA==&key=%E6%B5%8B%E8%AF%95' + + it('param2Obj test', () => { + expect(param2Obj(url)).toEqual({ + name: 'bill', + age: '29', + sex: '1', + field: window.btoa('test'), + key: '测试' + }) + }) +}) diff --git a/ssyx-admin/tests/unit/utils/parseTime.spec.js b/ssyx-admin/tests/unit/utils/parseTime.spec.js new file mode 100644 index 0000000..344439a --- /dev/null +++ b/ssyx-admin/tests/unit/utils/parseTime.spec.js @@ -0,0 +1,35 @@ +import {parseTime} from '@/utils/index.js' + +describe('Utils:parseTime', () => { + const d = new Date('2018-07-13 17:54:01') // "2018-07-13 17:54:01" + it('timestamp', () => { + expect(parseTime(d)).toBe('2018-07-13 17:54:01') + }) + it('timestamp string', () => { + expect(parseTime((d + ''))).toBe('2018-07-13 17:54:01') + }) + it('ten digits timestamp', () => { + expect(parseTime((d / 1000).toFixed(0))).toBe('2018-07-13 17:54:01') + }) + it('new Date', () => { + expect(parseTime(new Date(d))).toBe('2018-07-13 17:54:01') + }) + it('format', () => { + expect(parseTime(d, '{y}-{m}-{d} {h}:{i}')).toBe('2018-07-13 17:54') + expect(parseTime(d, '{y}-{m}-{d}')).toBe('2018-07-13') + expect(parseTime(d, '{y}/{m}/{d} {h}-{i}')).toBe('2018/07/13 17-54') + }) + it('get the day of the week', () => { + expect(parseTime(d, '{a}')).toBe('五') // 星期五 + }) + it('get the day of the week', () => { + expect(parseTime(+d + 1000 * 60 * 60 * 24 * 2, '{a}')).toBe('日') // 星期日 + }) + it('empty argument', () => { + expect(parseTime()).toBeNull() + }) + + it('null', () => { + expect(parseTime(null)).toBeNull() + }) +}) diff --git a/ssyx-admin/tests/unit/utils/validate.spec.js b/ssyx-admin/tests/unit/utils/validate.spec.js new file mode 100644 index 0000000..692c6f4 --- /dev/null +++ b/ssyx-admin/tests/unit/utils/validate.spec.js @@ -0,0 +1,17 @@ +import {validUsername, isExternal} from '@/utils/validate.js' + +describe('Utils:validate', () => { + it('validUsername', () => { + expect(validUsername('admin')).toBe(true) + expect(validUsername('editor')).toBe(true) + expect(validUsername('xxxx')).toBe(false) + }) + it('isExternal', () => { + expect(isExternal('https://github.com/PanJiaChen/vue-element-admin')).toBe(true) + expect(isExternal('http://github.com/PanJiaChen/vue-element-admin')).toBe(true) + expect(isExternal('github.com/PanJiaChen/vue-element-admin')).toBe(false) + expect(isExternal('/dashboard')).toBe(false) + expect(isExternal('./dashboard')).toBe(false) + expect(isExternal('dashboard')).toBe(false) + }) +}) diff --git a/ssyx-admin/vue.config.js b/ssyx-admin/vue.config.js new file mode 100644 index 0000000..08804d4 --- /dev/null +++ b/ssyx-admin/vue.config.js @@ -0,0 +1,123 @@ +'use strict' +const path = require('path') +const defaultSettings = require('./src/settings.js') + +function resolve(dir) { + return path.join(__dirname, dir) +} + +const name = defaultSettings.title || 'vue Admin Template' // page title + +// If your port is set to 80, +// use administrator privileges to execute the command line. +// For example, Mac: sudo npm run +// You can change the port by the following methods: +// port = 9528 npm run dev OR npm run dev --port = 9528 +const port = process.env.port || process.env.npm_config_port || 9528 // dev port + +// All configuration item explanations can be find in https://cli.vuejs.org/config/ +module.exports = { + /** + * You will need to set publicPath if you plan to deploy your site under a sub path, + * for example GitHub Pages. If you plan to deploy your site to https://foo.github.io/bar/, + * then publicPath should be set to "/bar/". + * In most cases please use '/' !!! + * Detail: https://cli.vuejs.org/config/#publicpath + */ + publicPath: '/', + outputDir: 'dist', + assetsDir: 'static', + lintOnSave: false, // process.env.NODE_ENV === 'development', + productionSourceMap: false, + devServer: { + port: port, + open: true, + overlay: { + warnings: false, + errors: true + }, + before: require('./mock/mock-server.js') + }, + configureWebpack: { + // provide the app's title in webpack's name field, so that + // it can be accessed in index.html to inject the correct title. + name: name, + resolve: { + alias: { + '@': resolve('src') + } + } + }, + chainWebpack(config) { + // it can improve the speed of the first screen, it is recommended to turn on preload + config.plugin('preload').tap(() => [ + { + rel: 'preload', + // to ignore runtime.js + // https://github.com/vuejs/vue-cli/blob/dev/packages/@vue/cli-service/lib/config/app.js#L171 + fileBlacklist: [/\.map$/, /hot-update\.js$/, /runtime\..*\.js$/], + include: 'initial' + } + ]) + + // when there are many pages, it will cause too many meaningless requests + config.plugins.delete('prefetch') + + // set svg-sprite-loader + config.module + .rule('svg') + .exclude.add(resolve('src/icons')) + .end() + config.module + .rule('icons') + .test(/\.svg$/) + .include.add(resolve('src/icons')) + .end() + .use('svg-sprite-loader') + .loader('svg-sprite-loader') + .options({ + symbolId: 'icon-[name]' + }) + .end() + + config + .when(process.env.NODE_ENV !== 'development', + config => { + config + .plugin('ScriptExtHtmlWebpackPlugin') + .after('html') + .use('script-ext-html-webpack-plugin', [{ + // `runtime` must same as runtimeChunk name. default is `runtime` + inline: /runtime\..*\.js$/ + }]) + .end() + config + .optimization.splitChunks({ + chunks: 'all', + cacheGroups: { + libs: { + name: 'chunk-libs', + test: /[\\/]node_modules[\\/]/, + priority: 10, + chunks: 'initial' // only package third parties that are initially dependent + }, + elementUI: { + name: 'chunk-elementUI', // split elementUI into a single package + priority: 20, // the weight needs to be larger than libs and app or it will be packaged into libs or app + test: /[\\/]node_modules[\\/]_?element-ui(.*)/ // in order to adapt to cnpm + }, + commons: { + name: 'chunk-commons', + test: resolve('src/components'), // can customize your rules + minChunks: 3, // minimum common number + priority: 5, + reuseExistingChunk: true + } + } + }) + // https:// webpack.js.org/configuration/optimization/#optimizationruntimechunk + config.optimization.runtimeChunk('single') + } + ) + } +}

{{ title }}

{{ title }}

活动信息

+ 规则列表 + 添加规则 +

+ 活动范围列表 + 添加活动范围 +

优惠券信息

添加规则

优惠券范围选择

+ 优惠券范围列表 + 添加优惠券范围 +

+ 优惠券范围列表 + 添加优惠券范围 +

订单信息

收货人信息

购物项信息

支付信息

基本信息

平台属性

商品图片

商品库存

商品海报

{{ title }}

{{ title }}

活动信息

+ 规则列表 + 添加规则 +

+ 活动范围列表 + 添加活动范围 +

优惠券信息

添加规则

优惠券范围选择

+ 优惠券范围列表 + 添加优惠券范围 +

+ 优惠券范围列表 + 添加优惠券范围 +

尚上优选平台管理端

订单信息

收货人信息

购物项信息

支付信息

基本信息

平台属性

商品图片

商品库存

商品海报