From e41f155d7b1a3f2784ce7eb3fe45fcb43946584f Mon Sep 17 00:00:00 2001 From: wuxueqiao <7382074+wuxueqiao@user.noreply.gitee.com> Date: Fri, 8 May 2020 15:40:19 +0800 Subject: [PATCH 001/211] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6=20?= =?UTF-8?q?.gitee?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitee/ISSUE_TEMPLATE.zh-CN.md | 13 ------------- .gitee/PULL_REQUEST_TEMPLATE.zh-CN.md | 15 --------------- 2 files changed, 28 deletions(-) delete mode 100644 .gitee/ISSUE_TEMPLATE.zh-CN.md delete mode 100644 .gitee/PULL_REQUEST_TEMPLATE.zh-CN.md diff --git a/.gitee/ISSUE_TEMPLATE.zh-CN.md b/.gitee/ISSUE_TEMPLATE.zh-CN.md deleted file mode 100644 index f09d98d..0000000 --- a/.gitee/ISSUE_TEMPLATE.zh-CN.md +++ /dev/null @@ -1,13 +0,0 @@ -### 该问题是怎么引起的？ - - - -### 重现步骤 - - - -### 报错信息 - - - - diff --git a/.gitee/PULL_REQUEST_TEMPLATE.zh-CN.md b/.gitee/PULL_REQUEST_TEMPLATE.zh-CN.md deleted file mode 100644 index 33948fd..0000000 --- a/.gitee/PULL_REQUEST_TEMPLATE.zh-CN.md +++ /dev/null @@ -1,15 +0,0 @@ -### 相关的Issue - - -### 原因（目的、解决的问题等） - - -### 描述（做了什么，变更了什么） - - -### 测试用例（新增、改动、可能影响的功能） - - - - - -- Gitee From d0976d8e335ba602d7986f770529128e55b9dc31 Mon Sep 17 00:00:00 2001 From: wuxueqiao <7382074+wuxueqiao@user.noreply.gitee.com> Date: Fri, 8 May 2020 15:40:29 +0800 Subject: [PATCH 002/211] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6=20?= =?UTF-8?q?README.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 37 ------------------------------------- 1 file changed, 37 deletions(-) delete mode 100644 README.md diff --git a/README.md b/README.md deleted file mode 100644 index 8c2fe9a..0000000 --- a/README.md +++ /dev/null @@ -1,37 +0,0 @@ -# softline-files-manage - -#### 介绍 -PC端 - -#### 软件架构 -软件架构说明 - - -#### 安装教程 - -1. xxxx -2. xxxx -3. xxxx - -#### 使用说明 - -1. xxxx -2. xxxx -3. xxxx - -#### 参与贡献 - -1. Fork 本仓库 -2. 新建 Feat_xxx 分支 -3. 提交代码 -4. 新建 Pull Request - - -#### 码云特技 - -1. 使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md -2. 码云官方博客 [blog.gitee.com](https://blog.gitee.com) -3. 你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解码云上的优秀开源项目 -4. [GVP](https://gitee.com/gvp) 全称是码云最有价值开源项目，是码云综合评定出的优秀开源项目 -5. 码云官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help) -6. 码云封面人物是一档用来展示码云会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) -- Gitee From e53846453fae69318c2d533548757894f23783f0 Mon Sep 17 00:00:00 2001 From: wuxueqiao <7382074+wuxueqiao@user.noreply.gitee.com> Date: Fri, 8 May 2020 15:40:45 +0800 Subject: [PATCH 003/211] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6=20?= =?UTF-8?q?README.en.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.en.md | 36 ------------------------------------ 1 file changed, 36 deletions(-) delete mode 100644 README.en.md diff --git a/README.en.md b/README.en.md deleted file mode 100644 index 2affc06..0000000 --- a/README.en.md +++ /dev/null @@ -1,36 +0,0 @@ -# softline-files-manage - -#### Description -PC端 - -#### Software Architecture -Software architecture description - -#### Installation - -1. xxxx -2. xxxx -3. xxxx - -#### Instructions - -1. xxxx -2. xxxx -3. xxxx - -#### Contribution - -1. Fork the repository -2. Create Feat_xxx branch -3. Commit your code -4. Create Pull Request - - -#### Gitee Feature - -1. You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md -2. Gitee blog [blog.gitee.com](https://blog.gitee.com) -3. Explore open source project [https://gitee.com/explore](https://gitee.com/explore) -4. The most valuable open source project [GVP](https://gitee.com/gvp) -5. The manual of Gitee [https://gitee.com/help](https://gitee.com/help) -6. The most popular members [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) -- Gitee From 26ae0e3e2f891ef2d740dd04404a7dc255771f52 Mon Sep 17 00:00:00 2001 From: wuxueqiao <17625808004@163.com> Date: Fri, 8 May 2020 15:57:05 +0800 Subject: [PATCH 004/211] =?UTF-8?q?=E5=90=8E=E7=AB=AF=E6=A1=86=E6=9E=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .mvn/wrapper/MavenWrapperDownloader.java | 117 ++++ .mvn/wrapper/maven-wrapper.jar | Bin 0 -> 50710 bytes .mvn/wrapper/maven-wrapper.properties | 2 + HELP.md | 15 + mvnw | 310 ++++++++++ mvnw.cmd | 182 ++++++ pom.xml | 161 +++++ softline-files-manage.iml | 127 ++++ .../line/SoftlineFilesManageApplication.java | 18 + .../controller/CertificateInfoController.java | 48 ++ .../soft/line/controller/LoginController.java | 25 + .../com/soft/line/entity/CertificateInfo.java | 360 ++++++++++++ .../line/mapper/CertificateInfoMapper.java | 36 ++ .../line/mapper/CertificateInfoMapper.xml | 61 ++ .../line/service/CertificateInfoService.java | 18 + .../impl/CertificateInfoServiceImpl.java | 26 + .../soft/line/util/config/Swagger2Config.java | 14 + .../com/soft/line/util/exception/Asserts.java | 18 + .../line/util/exception/CommonResult.java | 135 +++++ .../line/util/exception/GlobalException.java | 35 ++ .../soft/line/util/exception/IErrorCode.java | 12 + .../soft/line/util/exception/ResultCode.java | 34 ++ .../soft/line/util/exception/ResultData.java | 53 ++ .../line/util/generator/mybatis-generator.xml | 95 +++ .../jackson/converter/ConverterConfig.java | 33 ++ .../converter/StringToDateConverter.java | 21 + .../jackson/converter/StringToDateUtil.java | 88 +++ .../converter/StringToDoubleConverter.java | 19 + .../jackson/converter/StringToDoubleUtil.java | 26 + .../converter/StringToIntegerConverter.java | 19 + .../converter/StringToIntegerUtil.java | 41 ++ .../java/com/soft/line/xss/HTMLFilter.java | 554 ++++++++++++++++++ .../java/com/soft/line/xss/XssFilter.java | 35 ++ .../xss/XssHttpServletRequestWrapper.java | 45 ++ .../soft/line/xss/XssJacksonDeserializer.java | 24 + .../soft/line/xss/XssJacksonSerializer.java | 24 + src/main/resources/application.properties | 10 + .../SoftlineFilesManageApplicationTests.java | 13 + 38 files changed, 2854 insertions(+) create mode 100644 .mvn/wrapper/MavenWrapperDownloader.java create mode 100644 .mvn/wrapper/maven-wrapper.jar create mode 100644 .mvn/wrapper/maven-wrapper.properties create mode 100644 HELP.md create mode 100644 mvnw create mode 100644 mvnw.cmd create mode 100644 pom.xml create mode 100644 softline-files-manage.iml create mode 100644 src/main/java/com/soft/line/SoftlineFilesManageApplication.java create mode 100644 src/main/java/com/soft/line/controller/CertificateInfoController.java create mode 100644 src/main/java/com/soft/line/controller/LoginController.java create mode 100644 src/main/java/com/soft/line/entity/CertificateInfo.java create mode 100644 src/main/java/com/soft/line/mapper/CertificateInfoMapper.java create mode 100644 src/main/java/com/soft/line/mapper/CertificateInfoMapper.xml create mode 100644 src/main/java/com/soft/line/service/CertificateInfoService.java create mode 100644 src/main/java/com/soft/line/service/impl/CertificateInfoServiceImpl.java create mode 100644 src/main/java/com/soft/line/util/config/Swagger2Config.java create mode 100644 src/main/java/com/soft/line/util/exception/Asserts.java create mode 100644 src/main/java/com/soft/line/util/exception/CommonResult.java create mode 100644 src/main/java/com/soft/line/util/exception/GlobalException.java create mode 100644 src/main/java/com/soft/line/util/exception/IErrorCode.java create mode 100644 src/main/java/com/soft/line/util/exception/ResultCode.java create mode 100644 src/main/java/com/soft/line/util/exception/ResultData.java create mode 100644 src/main/java/com/soft/line/util/generator/mybatis-generator.xml create mode 100644 src/main/java/com/soft/line/util/jackson/converter/ConverterConfig.java create mode 100644 src/main/java/com/soft/line/util/jackson/converter/StringToDateConverter.java create mode 100644 src/main/java/com/soft/line/util/jackson/converter/StringToDateUtil.java create mode 100644 src/main/java/com/soft/line/util/jackson/converter/StringToDoubleConverter.java create mode 100644 src/main/java/com/soft/line/util/jackson/converter/StringToDoubleUtil.java create mode 100644 src/main/java/com/soft/line/util/jackson/converter/StringToIntegerConverter.java create mode 100644 src/main/java/com/soft/line/util/jackson/converter/StringToIntegerUtil.java create mode 100644 src/main/java/com/soft/line/xss/HTMLFilter.java create mode 100644 src/main/java/com/soft/line/xss/XssFilter.java create mode 100644 src/main/java/com/soft/line/xss/XssHttpServletRequestWrapper.java create mode 100644 src/main/java/com/soft/line/xss/XssJacksonDeserializer.java create mode 100644 src/main/java/com/soft/line/xss/XssJacksonSerializer.java create mode 100644 src/main/resources/application.properties create mode 100644 src/test/java/com/soft/line/SoftlineFilesManageApplicationTests.java diff --git a/.mvn/wrapper/MavenWrapperDownloader.java b/.mvn/wrapper/MavenWrapperDownloader.java new file mode 100644 index 0000000..e76d1f3 --- /dev/null +++ b/.mvn/wrapper/MavenWrapperDownloader.java @@ -0,0 +1,117 @@ +/* + * Copyright 2007-present the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +import java.net.*; +import java.io.*; +import java.nio.channels.*; +import java.util.Properties; + +public class MavenWrapperDownloader { + + private static final String WRAPPER_VERSION = "0.5.6"; + /** + * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided. + */ + private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/" + + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar"; + + /** + * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to + * use instead of the default one. + */ + private static final String MAVEN_WRAPPER_PROPERTIES_PATH = + ".mvn/wrapper/maven-wrapper.properties"; + + /** + * Path where the maven-wrapper.jar will be saved to. + */ + private static final String MAVEN_WRAPPER_JAR_PATH = + ".mvn/wrapper/maven-wrapper.jar"; + + /** + * Name of the property which should be used to override the default download url for the wrapper. + */ + private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl"; + + public static void main(String args[]) { + System.out.println("- Downloader started"); + File baseDirectory = new File(args[0]); + System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath()); + + // If the maven-wrapper.properties exists, read it and check if it contains a custom + // wrapperUrl parameter. + File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH); + String url = DEFAULT_DOWNLOAD_URL; + if(mavenWrapperPropertyFile.exists()) { + FileInputStream mavenWrapperPropertyFileInputStream = null; + try { + mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile); + Properties mavenWrapperProperties = new Properties(); + mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream); + url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url); + } catch (IOException e) { + System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'"); + } finally { + try { + if(mavenWrapperPropertyFileInputStream != null) { + mavenWrapperPropertyFileInputStream.close(); + } + } catch (IOException e) { + // Ignore ... + } + } + } + System.out.println("- Downloading from: " + url); + + File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH); + if(!outputFile.getParentFile().exists()) { + if(!outputFile.getParentFile().mkdirs()) { + System.out.println( + "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'"); + } + } + System.out.println("- Downloading to: " + outputFile.getAbsolutePath()); + try { + downloadFileFromURL(url, outputFile); + System.out.println("Done"); + System.exit(0); + } catch (Throwable e) { + System.out.println("- Error downloading"); + e.printStackTrace(); + System.exit(1); + } + } + + private static void downloadFileFromURL(String urlString, File destination) throws Exception { + if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) { + String username = System.getenv("MVNW_USERNAME"); + char[] password = System.getenv("MVNW_PASSWORD").toCharArray(); + Authenticator.setDefault(new Authenticator() { + @Override + protected PasswordAuthentication getPasswordAuthentication() { + return new PasswordAuthentication(username, password); + } + }); + } + URL website = new URL(urlString); + ReadableByteChannel rbc; + rbc = Channels.newChannel(website.openStream()); + FileOutputStream fos = new FileOutputStream(destination); + fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE); + fos.close(); + rbc.close(); + } + +} diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..2cc7d4a55c0cd0092912bf49ae38b3a9e3fd0054 GIT binary patch literal 50710 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 EfAhh=DF6Tf literal 0 HcmV?d00001 diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000..642d572 --- /dev/null +++ b/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,2 @@ +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar diff --git a/HELP.md b/HELP.md new file mode 100644 index 0000000..1ee487d --- /dev/null +++ b/HELP.md @@ -0,0 +1,15 @@ +# Getting Started + +### Reference Documentation +For further reference, please consider the following sections: + +* [Official Apache Maven documentation](https://maven.apache.org/guides/index.html) +* [Spring Boot Maven Plugin Reference Guide](https://docs.spring.io/spring-boot/docs/2.2.7.RELEASE/maven-plugin/) +* [MyBatis Framework](https://mybatis.org/spring-boot-starter/mybatis-spring-boot-autoconfigure/) + +### Guides +The following guides illustrate how to use some features concretely: + +* [MyBatis Quick Start](https://github.com/mybatis/spring-boot-starter/wiki/Quick-Start) +* [Accessing data with MySQL](https://spring.io/guides/gs/accessing-data-mysql/) + diff --git a/mvnw b/mvnw new file mode 100644 index 0000000..a16b543 --- /dev/null +++ b/mvnw @@ -0,0 +1,310 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Maven Start Up Batch script +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# M2_HOME - location of maven2's installed home dir +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# ---------------------------------------------------------------------------- + +if [ -z "$MAVEN_SKIP_RC" ] ; then + + if [ -f /etc/mavenrc ] ; then + . /etc/mavenrc + fi + + if [ -f "$HOME/.mavenrc" ] ; then + . "$HOME/.mavenrc" + fi + +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +darwin=false; +mingw=false +case "`uname`" in + CYGWIN*) cygwin=true ;; + MINGW*) mingw=true;; + Darwin*) darwin=true + # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home + # See https://developer.apple.com/library/mac/qa/qa1170/_index.html + if [ -z "$JAVA_HOME" ]; then + if [ -x "/usr/libexec/java_home" ]; then + export JAVA_HOME="`/usr/libexec/java_home`" + else + export JAVA_HOME="/Library/Java/Home" + fi + fi + ;; +esac + +if [ -z "$JAVA_HOME" ] ; then + if [ -r /etc/gentoo-release ] ; then + JAVA_HOME=`java-config --jre-home` + fi +fi + +if [ -z "$M2_HOME" ] ; then + ## resolve links - $0 may be a link to maven's home + PRG="$0" + + # need this for relative symlinks + while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG="`dirname "$PRG"`/$link" + fi + done + + saveddir=`pwd` + + M2_HOME=`dirname "$PRG"`/.. + + # make it fully qualified + M2_HOME=`cd "$M2_HOME" && pwd` + + cd "$saveddir" + # echo Using m2 at $M2_HOME +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --unix "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --unix "$CLASSPATH"` +fi + +# For Mingw, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$M2_HOME" ] && + M2_HOME="`(cd "$M2_HOME"; pwd)`" + [ -n "$JAVA_HOME" ] && + JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="`which javac`" + if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=`which readlink` + if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then + if $darwin ; then + javaHome="`dirname \"$javaExecutable\"`" + javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" + else + javaExecutable="`readlink -f \"$javaExecutable\"`" + fi + javaHome="`dirname \"$javaExecutable\"`" + javaHome=`expr "$javaHome" : '\(.*\)/bin'` + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ] ; then + if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + else + JAVACMD="`which java`" + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ] ; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + + if [ -z "$1" ] + then + echo "Path not specified to find_maven_basedir" + return 1 + fi + + basedir="$1" + wdir="$1" + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + # workaround for JBEAP-8937 (on Solaris 10/Sparc) + if [ -d "${wdir}" ]; then + wdir=`cd "$wdir/.."; pwd` + fi + # end of workaround + done + echo "${basedir}" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + echo "$(tr -s '\n' ' ' < "$1")" + fi +} + +BASE_DIR=`find_maven_basedir "$(pwd)"` +if [ -z "$BASE_DIR" ]; then + exit 1; +fi + +########################################################################################## +# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +# This allows using the maven wrapper in projects that prohibit checking in binary data. +########################################################################################## +if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found .mvn/wrapper/maven-wrapper.jar" + fi +else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..." + fi + if [ -n "$MVNW_REPOURL" ]; then + jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + else + jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + fi + while IFS="=" read key value; do + case "$key" in (wrapperUrl) jarUrl="$value"; break ;; + esac + done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties" + if [ "$MVNW_VERBOSE" = true ]; then + echo "Downloading from: $jarUrl" + fi + wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" + if $cygwin; then + wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"` + fi + + if command -v wget > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found wget ... using wget" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + wget "$jarUrl" -O "$wrapperJarPath" + else + wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" + fi + elif command -v curl > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found curl ... using curl" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + curl -o "$wrapperJarPath" "$jarUrl" -f + else + curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f + fi + + else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Falling back to using Java to download" + fi + javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java" + # For Cygwin, switch paths to Windows format before running javac + if $cygwin; then + javaClass=`cygpath --path --windows "$javaClass"` + fi + if [ -e "$javaClass" ]; then + if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Compiling MavenWrapperDownloader.java ..." + fi + # Compiling the Java class + ("$JAVA_HOME/bin/javac" "$javaClass") + fi + if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + # Running the downloader + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Running MavenWrapperDownloader.java ..." + fi + ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR") + fi + fi + fi +fi +########################################################################################## +# End of extension +########################################################################################## + +export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} +if [ "$MVNW_VERBOSE" = true ]; then + echo $MAVEN_PROJECTBASEDIR +fi +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --path --windows "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` + [ -n "$MAVEN_PROJECTBASEDIR" ] && + MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` +fi + +# Provide a "standardized" way to retrieve the CLI args that will +# work with both Windows and non-Windows executions. +MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@" +export MAVEN_CMD_LINE_ARGS + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +exec "$JAVACMD" \ + $MAVEN_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/mvnw.cmd b/mvnw.cmd new file mode 100644 index 0000000..c8d4337 --- /dev/null +++ b/mvnw.cmd @@ -0,0 +1,182 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM https://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Maven Start Up Batch script +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM M2_HOME - location of maven2's installed home dir +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM set title of command window +title %0 +@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat" +if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd" +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + +FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B +) + +@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +@REM This allows using the maven wrapper in projects that prohibit checking in binary data. +if exist %WRAPPER_JAR% ( + if "%MVNW_VERBOSE%" == "true" ( + echo Found %WRAPPER_JAR% + ) +) else ( + if not "%MVNW_REPOURL%" == "" ( + SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + ) + if "%MVNW_VERBOSE%" == "true" ( + echo Couldn't find %WRAPPER_JAR%, downloading it ... + echo Downloading from: %DOWNLOAD_URL% + ) + + powershell -Command "&{"^ + "$webclient = new-object System.Net.WebClient;"^ + "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ + "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ + "}"^ + "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^ + "}" + if "%MVNW_VERBOSE%" == "true" ( + echo Finished downloading %WRAPPER_JAR% + ) +) +@REM End of extension + +@REM Provide a "standardized" way to retrieve the CLI args that will +@REM work with both Windows and non-Windows executions. +set MAVEN_CMD_LINE_ARGS=%* + +%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat" +if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%" == "on" pause + +if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE% + +exit /B %ERROR_CODE% diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..d2ef898 --- /dev/null +++ b/pom.xml @@ -0,0 +1,161 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 2.2.7.RELEASE + + + com.soft.line + softline-files-manage + 0.0.1-SNAPSHOT + softline-files-manage + Demo project for Spring Boot + + + 1.8 + 3.9 + 2.6 + 1.9.4 + 1.13 + 4.4 + 1.4 + 1.8 + + + + + org.mybatis.spring.boot + mybatis-spring-boot-starter + 2.1.2 + + + + org.springframework.boot + spring-boot-starter-web + + + mysql + mysql-connector-java + 5.1.40 + runtime + + + org.springframework.boot + spring-boot-starter-test + test + + + org.junit.vintage + junit-vintage-engine + + + + + + + org.apache.commons + commons-lang3 + ${apache.commons-lang3.version} + + + commons-io + commons-io + ${apache.commons-io.version} + + + commons-fileupload + commons-fileupload + ${apache.commons-fileupload.version} + + + commons-beanutils + commons-beanutils + ${apache.commons-beanutils.version} + + + org.apache.commons + commons-collections4 + ${apache.commons-collections4.version} + + + org.apache.commons + commons-pool2 + + + org.apache.commons + commons-text + ${apache.commons-text.version} + + + org.projectlombok + lombok + 1.18.12 + + + + + org.springframework.boot + spring-boot-devtools + + + io.springfox + springfox-swagger2 + 2.5.0 + + + + io.springfox + springfox-swagger-ui + 2.5.0 + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + org.mybatis.generator + mybatis-generator-maven-plugin + 1.3.2 + + + src/main/java/com/soft/line/util/generator/mybatis-generator.xml + + true + true + + + + + Generate MyBatis Artifacts + generate + + + + + org.mybatis.generator + mybatis-generator-core + 1.3.2 + + + + + + + + src/main/java + + **/*.xml + + + + + + + diff --git a/softline-files-manage.iml b/softline-files-manage.iml new file mode 100644 index 0000000..316ac03 --- /dev/null +++ b/softline-files-manage.iml @@ -0,0 +1,127 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/soft/line/SoftlineFilesManageApplication.java b/src/main/java/com/soft/line/SoftlineFilesManageApplication.java new file mode 100644 index 0000000..cf18d73 --- /dev/null +++ b/src/main/java/com/soft/line/SoftlineFilesManageApplication.java @@ -0,0 +1,18 @@ +package com.soft.line; + +import lombok.extern.slf4j.Slf4j; +import org.mybatis.spring.annotation.MapperScan; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +@MapperScan(basePackages = "com.soft.line.mapper") +@Slf4j +public class SoftlineFilesManageApplication { + + public static void main(String[] args) { + SpringApplication.run(SoftlineFilesManageApplication.class, args); + log.info("--->SoftlineFilesManageApplication has already started<---"); + } + +} diff --git a/src/main/java/com/soft/line/controller/CertificateInfoController.java b/src/main/java/com/soft/line/controller/CertificateInfoController.java new file mode 100644 index 0000000..95bc9d0 --- /dev/null +++ b/src/main/java/com/soft/line/controller/CertificateInfoController.java @@ -0,0 +1,48 @@ +package com.soft.line.controller; + +import com.soft.line.entity.CertificateInfo; +import com.soft.line.service.CertificateInfoService; +import com.soft.line.util.exception.CommonResult; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * @author wu.xueqiao on 2020/5/8. + * @version 0.1 + */ + +@Api(description = "证书接口") +@Slf4j +@RestController +@RequestMapping("/certificateInfo") +public class CertificateInfoController { + + @Autowired + private CertificateInfoService certificateInfoService; + + + + + @ApiOperation(value = "个人证书列表", notes = "证书列表") + //设置请求参数 + @ApiImplicitParams({ + // @ApiImplicitParam(paramType = "query", name = "userName", value = "名称", required = false, dataType = "String"), + // @ApiImplicitParam(paramType = "query", name = "dicCode", value = "编码", required = false, dataType = "String") + // ..... + }) + @GetMapping("/getPersonalAll/{userName}") + public CommonResult> getPersonalAll(@PathVariable("userName") String userName) { + return CommonResult.success(certificateInfoService.getPersonalAll(userName)); + + } +} diff --git a/src/main/java/com/soft/line/controller/LoginController.java b/src/main/java/com/soft/line/controller/LoginController.java new file mode 100644 index 0000000..bb0912f --- /dev/null +++ b/src/main/java/com/soft/line/controller/LoginController.java @@ -0,0 +1,25 @@ +package com.soft.line.controller; + +import com.soft.line.util.exception.ResultData; +import org.springframework.web.bind.annotation.*; + +/** + * @author wu.xueqiao on 2020/5/8. + * @version 0.1 + */ +@RestController +@RequestMapping("/user") +public class LoginController { + + + + @PostMapping("/register") + public ResultData registerUserInfo(@RequestParam String username,@RequestParam String password){ + + ResultData resultData=new ResultData(); + + + return resultData; + + } +} diff --git a/src/main/java/com/soft/line/entity/CertificateInfo.java b/src/main/java/com/soft/line/entity/CertificateInfo.java new file mode 100644 index 0000000..24ecf5e --- /dev/null +++ b/src/main/java/com/soft/line/entity/CertificateInfo.java @@ -0,0 +1,360 @@ +package com.soft.line.entity; + +import java.io.Serializable; +import java.util.Date; + + +public class CertificateInfo implements Serializable{ + private static final long serialVersionUID = 688776107177440102L; + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column certificate_info.id + * + * @mbggenerated + */ + private Long id; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column certificate_info.cert_id + * + * @mbggenerated + */ + private Long certId; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column certificate_info.cert_type + * + * @mbggenerated + */ + private String certType; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column certificate_info.cert_name + * + * @mbggenerated + */ + private String certName; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column certificate_info.cert_unit + * + * @mbggenerated + */ + private String certUnit; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column certificate_info.begin_date + * + * @mbggenerated + */ + private Date beginDate; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column certificate_info.end_date + * + * @mbggenerated + */ + private Date endDate; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column certificate_info.cert_attachment + * + * @mbggenerated + */ + private String certAttachment; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column certificate_info.note + * + * @mbggenerated + */ + private String note; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column certificate_info.modify_person + * + * @mbggenerated + */ + private String modifyPerson; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column certificate_info.modify_time + * + * @mbggenerated + */ + private Date modifyTime; + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column certificate_info.id + * + * @return the value of certificate_info.id + * + * @mbggenerated + */ + public Long getId() { + return id; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column certificate_info.id + * + * @param id the value for certificate_info.id + * + * @mbggenerated + */ + public void setId(Long id) { + this.id = id; + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column certificate_info.cert_id + * + * @return the value of certificate_info.cert_id + * + * @mbggenerated + */ + public Long getCertId() { + return certId; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column certificate_info.cert_id + * + * @param certId the value for certificate_info.cert_id + * + * @mbggenerated + */ + public void setCertId(Long certId) { + this.certId = certId; + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column certificate_info.cert_type + * + * @return the value of certificate_info.cert_type + * + * @mbggenerated + */ + public String getCertType() { + return certType; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column certificate_info.cert_type + * + * @param certType the value for certificate_info.cert_type + * + * @mbggenerated + */ + public void setCertType(String certType) { + this.certType = certType == null ? null : certType.trim(); + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column certificate_info.cert_name + * + * @return the value of certificate_info.cert_name + * + * @mbggenerated + */ + public String getCertName() { + return certName; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column certificate_info.cert_name + * + * @param certName the value for certificate_info.cert_name + * + * @mbggenerated + */ + public void setCertName(String certName) { + this.certName = certName == null ? null : certName.trim(); + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column certificate_info.cert_unit + * + * @return the value of certificate_info.cert_unit + * + * @mbggenerated + */ + public String getCertUnit() { + return certUnit; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column certificate_info.cert_unit + * + * @param certUnit the value for certificate_info.cert_unit + * + * @mbggenerated + */ + public void setCertUnit(String certUnit) { + this.certUnit = certUnit == null ? null : certUnit.trim(); + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column certificate_info.begin_date + * + * @return the value of certificate_info.begin_date + * + * @mbggenerated + */ + public Date getBeginDate() { + return beginDate; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column certificate_info.begin_date + * + * @param beginDate the value for certificate_info.begin_date + * + * @mbggenerated + */ + public void setBeginDate(Date beginDate) { + this.beginDate = beginDate; + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column certificate_info.end_date + * + * @return the value of certificate_info.end_date + * + * @mbggenerated + */ + public Date getEndDate() { + return endDate; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column certificate_info.end_date + * + * @param endDate the value for certificate_info.end_date + * + * @mbggenerated + */ + public void setEndDate(Date endDate) { + this.endDate = endDate; + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column certificate_info.cert_attachment + * + * @return the value of certificate_info.cert_attachment + * + * @mbggenerated + */ + public String getCertAttachment() { + return certAttachment; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column certificate_info.cert_attachment + * + * @param certAttachment the value for certificate_info.cert_attachment + * + * @mbggenerated + */ + public void setCertAttachment(String certAttachment) { + this.certAttachment = certAttachment == null ? null : certAttachment.trim(); + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column certificate_info.note + * + * @return the value of certificate_info.note + * + * @mbggenerated + */ + public String getNote() { + return note; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column certificate_info.note + * + * @param note the value for certificate_info.note + * + * @mbggenerated + */ + public void setNote(String note) { + this.note = note == null ? null : note.trim(); + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column certificate_info.modify_person + * + * @return the value of certificate_info.modify_person + * + * @mbggenerated + */ + public String getModifyPerson() { + return modifyPerson; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column certificate_info.modify_person + * + * @param modifyPerson the value for certificate_info.modify_person + * + * @mbggenerated + */ + public void setModifyPerson(String modifyPerson) { + this.modifyPerson = modifyPerson == null ? null : modifyPerson.trim(); + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column certificate_info.modify_time + * + * @return the value of certificate_info.modify_time + * + * @mbggenerated + */ + public Date getModifyTime() { + return modifyTime; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column certificate_info.modify_time + * + * @param modifyTime the value for certificate_info.modify_time + * + * @mbggenerated + */ + public void setModifyTime(Date modifyTime) { + this.modifyTime = modifyTime; + } +} \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/CertificateInfoMapper.java b/src/main/java/com/soft/line/mapper/CertificateInfoMapper.java new file mode 100644 index 0000000..f04a340 --- /dev/null +++ b/src/main/java/com/soft/line/mapper/CertificateInfoMapper.java @@ -0,0 +1,36 @@ +package com.soft.line.mapper; + +import com.soft.line.entity.CertificateInfo; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface CertificateInfoMapper { + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table certificate_info + * + * @mbggenerated + */ + int insert(CertificateInfo record); + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table certificate_info + * + * @mbggenerated + */ + CertificateInfo selectByPrimaryKey(Long id); + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table certificate_info + * + * @mbggenerated + */ + List selectAll(); + + + List getPersonalAll(String userName); +} \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/CertificateInfoMapper.xml b/src/main/java/com/soft/line/mapper/CertificateInfoMapper.xml new file mode 100644 index 0000000..54ff612 --- /dev/null +++ b/src/main/java/com/soft/line/mapper/CertificateInfoMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + insert into `certificate_info` (`cert_id`, `cert_type`, `cert_name`, + `cert_unit`, `begin_date`, `end_date`, + `cert_attachment`, `note`, `modify_person`, + `modify_time`) + values (#{certId,jdbcType=BIGINT}, #{certType,jdbcType=VARCHAR}, #{certName,jdbcType=VARCHAR}, + #{certUnit,jdbcType=VARCHAR}, #{beginDate,jdbcType=TIMESTAMP}, #{endDate,jdbcType=TIMESTAMP}, + #{certAttachment,jdbcType=VARCHAR}, #{note,jdbcType=VARCHAR}, #{modifyPerson,jdbcType=VARCHAR}, + #{modifyTime,jdbcType=TIMESTAMP}) + + + + + + \ No newline at end of file diff --git a/src/main/java/com/soft/line/service/CertificateInfoService.java b/src/main/java/com/soft/line/service/CertificateInfoService.java new file mode 100644 index 0000000..98bc6a7 --- /dev/null +++ b/src/main/java/com/soft/line/service/CertificateInfoService.java @@ -0,0 +1,18 @@ +package com.soft.line.service; + +import com.soft.line.entity.CertificateInfo; +import com.soft.line.mapper.CertificateInfoMapper; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @author wu.xueqiao on 2020/5/8. + * @version 0.1 + */ + +public interface CertificateInfoService { + + public List getPersonalAll(String userName); +} diff --git a/src/main/java/com/soft/line/service/impl/CertificateInfoServiceImpl.java b/src/main/java/com/soft/line/service/impl/CertificateInfoServiceImpl.java new file mode 100644 index 0000000..4070152 --- /dev/null +++ b/src/main/java/com/soft/line/service/impl/CertificateInfoServiceImpl.java @@ -0,0 +1,26 @@ +package com.soft.line.service.impl; + +import com.soft.line.entity.CertificateInfo; +import com.soft.line.mapper.CertificateInfoMapper; +import com.soft.line.service.CertificateInfoService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @author wu.xueqiao on 2020/5/8. + * @version 0.1 + */ +@Service +@Slf4j +public class CertificateInfoServiceImpl implements CertificateInfoService { + + @Autowired + private CertificateInfoMapper certificateInfoMapper; + @Override + public List getPersonalAll(String userName) { + return certificateInfoMapper.getPersonalAll(userName); + } +} diff --git a/src/main/java/com/soft/line/util/config/Swagger2Config.java b/src/main/java/com/soft/line/util/config/Swagger2Config.java new file mode 100644 index 0000000..3659018 --- /dev/null +++ b/src/main/java/com/soft/line/util/config/Swagger2Config.java @@ -0,0 +1,14 @@ +package com.soft.line.util.config; + +import org.springframework.context.annotation.Configuration; +import springfox.documentation.swagger2.annotations.EnableSwagger2; + +/** + * @author wu.xueqiao on 2020/5/8. + * @version 0.1 + */ + +@Configuration +@EnableSwagger2 +public class Swagger2Config { +} diff --git a/src/main/java/com/soft/line/util/exception/Asserts.java b/src/main/java/com/soft/line/util/exception/Asserts.java new file mode 100644 index 0000000..7760abd --- /dev/null +++ b/src/main/java/com/soft/line/util/exception/Asserts.java @@ -0,0 +1,18 @@ +package com.soft.line.util.exception; + + + +/** + * @Description 断言处理类，用于抛出各种API异常 + * @Author wu.xueqiao + * @Date 2020/05/08 12:47 + */ +public class Asserts { + public static void fail(String message) { + throw new GlobalException(message); + } + + public static void fail(IErrorCode errorCode) { + throw new GlobalException(errorCode); + } +} diff --git a/src/main/java/com/soft/line/util/exception/CommonResult.java b/src/main/java/com/soft/line/util/exception/CommonResult.java new file mode 100644 index 0000000..62af127 --- /dev/null +++ b/src/main/java/com/soft/line/util/exception/CommonResult.java @@ -0,0 +1,135 @@ +package com.soft.line.util.exception; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @Description 返回详细信息 + * @Author wu.xueqiao + * @Date 2020/05/08 12:47 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +public class CommonResult { + private Integer code; + private String msg; + private T data; + + public CommonResult(Integer code, String msg) { + this.code = code; + this.msg = msg; + } + + /** + * 成功返回结果 + * + * @param data 获取的数据 + * @param + * @return + */ + public static CommonResult success(T data) { + return new CommonResult(ResultCode.SUCCESS.getCode(), ResultCode.SUCCESS.getMessage(), data); + } + + /** + * 成功返回结果 + * + * @param data 获取的数据 + * @param message 提示信息 + * @param + * @return + */ + public static CommonResult success(T data, String message) { + return new CommonResult(ResultCode.SUCCESS.getCode(), message, data); + } + + /** + * 失败返回结果 + * + * @param errorCode 错误码 + * @param + * @return + */ + public static CommonResult failed(IErrorCode errorCode) { + return new CommonResult(errorCode.getCode(), errorCode.getMessage(), null); + } + + /** + * 失败返回结果 + * + * @param errorCode 错误码 + * @param message 提示信息 + * @param + * @return + */ + public static CommonResult failed(IErrorCode errorCode, String message) { + return new CommonResult(errorCode.getCode(), message, null); + } + + /** + * 失败返回结果 + * + * @param message 提示信息 + * @param + * @return + */ + public static CommonResult failed(String message) { + return new CommonResult(ResultCode.FAILED.getCode(), message, null); + } + + + /** + * 失败返回结果 + * + * @param + * @return + */ + public static CommonResult failed() { + return failed(ResultCode.FAILED); + } + + /** + * 参数验证失败返回结果 + * + * @param + * @return + */ + public static CommonResult validateFailed() { + return failed(ResultCode.VALIDATE_FAILED); + } + + /** + * 提示信息 + * + * @param message 提示信息 + * @param + * @return + */ + public static CommonResult validateFailed(String message) { + return new CommonResult(ResultCode.VALIDATE_FAILED.getCode(), message, null); + } + + /** + * 未登录返回结果 + * + * @param data 获取的数据 + * @param + * @return + */ + public static CommonResult unauthorized(T data) { + return new CommonResult(ResultCode.UNAUTHORIZED.getCode(), ResultCode.UNAUTHORIZED.getMessage(), data); + } + + /** + * 未授权返回结果 + * + * @param data 获取的数据 + * @param + * @return + */ + public static CommonResult forbidden(T data) { + return new CommonResult(ResultCode.FORBIDDEN.getCode(), ResultCode.FORBIDDEN.getMessage(), data); + } +} diff --git a/src/main/java/com/soft/line/util/exception/GlobalException.java b/src/main/java/com/soft/line/util/exception/GlobalException.java new file mode 100644 index 0000000..debf63b --- /dev/null +++ b/src/main/java/com/soft/line/util/exception/GlobalException.java @@ -0,0 +1,35 @@ +package com.soft.line.util.exception; + + + +/** + * @Description 自定义异常 + * @Author wu.xueqiao + * @Date 2020/05/08 12:47 + */ + +public class GlobalException extends RuntimeException { + private IErrorCode errorCode; + + public IErrorCode getErrorCode() { + return errorCode; + } + + public GlobalException(IErrorCode errorCode) { + super(errorCode.getMessage()); + this.errorCode = errorCode; + } + + public GlobalException(String message) { + super(message); + } + + public GlobalException(Throwable cause) { + super(cause); + } + + public GlobalException(String message, Throwable cause) { + super(message, cause); + } + +} diff --git a/src/main/java/com/soft/line/util/exception/IErrorCode.java b/src/main/java/com/soft/line/util/exception/IErrorCode.java new file mode 100644 index 0000000..e22940b --- /dev/null +++ b/src/main/java/com/soft/line/util/exception/IErrorCode.java @@ -0,0 +1,12 @@ +package com.soft.line.util.exception; + +/** + * @Description 封装API的错误码 + * @Author wu.xueqiao + * @Date 2020/05/08 12:47 + */ +public interface IErrorCode { + Integer getCode(); + + String getMessage(); +} diff --git a/src/main/java/com/soft/line/util/exception/ResultCode.java b/src/main/java/com/soft/line/util/exception/ResultCode.java new file mode 100644 index 0000000..838676a --- /dev/null +++ b/src/main/java/com/soft/line/util/exception/ResultCode.java @@ -0,0 +1,34 @@ +package com.soft.line.util.exception; + +/** + * @Description 枚举一些常用API操作码 + * @Author wu.xueqiao + * @Date 2020/05/08 12:47 + */ +public enum ResultCode implements IErrorCode { + + SUCCESS(200, "操作成功"), + FAILED(500, "操作失败"), + VALIDATE_FAILED(404, "参数检验失败"), + UNAUTHORIZED(401, "暂未登录或token已经过期"), + FORBIDDEN(403, "没有相关权限"); + + + private Integer code; + private String message; + + private ResultCode(Integer code, String message) { + this.code = code; + this.message = message; + } + + public Integer getCode() { + return code; + } + + public String getMessage() { + return message; + } + + +} diff --git a/src/main/java/com/soft/line/util/exception/ResultData.java b/src/main/java/com/soft/line/util/exception/ResultData.java new file mode 100644 index 0000000..721c2d5 --- /dev/null +++ b/src/main/java/com/soft/line/util/exception/ResultData.java @@ -0,0 +1,53 @@ +package com.soft.line.util.exception; + +import java.io.Serializable; + +public class ResultData implements Serializable { + + private static final long serialVersionUID = 6342989717148610893L; + private String status; + + private String msg; + + private Object data; + + public String getStatus() { + + return status; + } + + public void setStatus(final String status) { + + this.status = status; + } + + public String getMsg() { + + return msg; + } + + public void setMsg(final String msg) { + + this.msg = msg; + } + + public Object getData() { + + return data; + } + + public void setData(final Object data) { + + this.data = data; + } + + public ResultData(final String status, final String msg, final Object data) { + super(); + this.data = data; + this.status = status; + this.msg = msg; + } + + public ResultData() { + } +} diff --git a/src/main/java/com/soft/line/util/generator/mybatis-generator.xml b/src/main/java/com/soft/line/util/generator/mybatis-generator.xml new file mode 100644 index 0000000..49e1003 --- /dev/null +++ b/src/main/java/com/soft/line/util/generator/mybatis-generator.xml @@ -0,0 +1,95 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + \ No newline at end of file diff --git a/src/main/java/com/soft/line/util/jackson/converter/ConverterConfig.java b/src/main/java/com/soft/line/util/jackson/converter/ConverterConfig.java new file mode 100644 index 0000000..ec27878 --- /dev/null +++ b/src/main/java/com/soft/line/util/jackson/converter/ConverterConfig.java @@ -0,0 +1,33 @@ +package com.soft.line.util.jackson.converter; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.core.convert.converter.Converter; + +import java.util.Date; + +/** + * 转换器配置 + * + * @author + * @date + */ +@Configuration +public class ConverterConfig { + + @Bean + public Converter stringToDateConverter() { + return new StringToDateConverter(); + } + + @Bean + public Converter stringToIntegerConverter() { + return new StringToIntegerConverter(); + } + + @Bean + public Converter stringToDoubleConverter() { + return new StringToDoubleConverter(); + } + +} diff --git a/src/main/java/com/soft/line/util/jackson/converter/StringToDateConverter.java b/src/main/java/com/soft/line/util/jackson/converter/StringToDateConverter.java new file mode 100644 index 0000000..929e769 --- /dev/null +++ b/src/main/java/com/soft/line/util/jackson/converter/StringToDateConverter.java @@ -0,0 +1,21 @@ +package com.soft.line.util.jackson.converter; + +import org.springframework.core.convert.converter.Converter; + +import java.util.Date; + +/** + * + * 日期转换器,将请求参数的日期字符串转换成java.util.Date类型 + * + * + * @author + * @date + */ +public class StringToDateConverter implements Converter { + + @Override + public Date convert(String source) { + return StringToDateUtil.convert(source); + } +} diff --git a/src/main/java/com/soft/line/util/jackson/converter/StringToDateUtil.java b/src/main/java/com/soft/line/util/jackson/converter/StringToDateUtil.java new file mode 100644 index 0000000..8211610 --- /dev/null +++ b/src/main/java/com/soft/line/util/jackson/converter/StringToDateUtil.java @@ -0,0 +1,88 @@ +package com.soft.line.util.jackson.converter; + +import org.apache.commons.lang3.StringUtils; + +import java.text.DateFormat; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Date; + +/** + * + * 
+ * 日期转换器,将请求参数的日期字符串转换成java.util.Date类型
+ * 日期格式顺序:
+ * 	1.yyyy-MM-dd HH:mm:ss:S
+ * 	2.yyyy-MM-dd HH:mm:ss
+ * 	3.yyyy-MM-dd HH:mm
+ * 	4.yyyy-MM-dd HH
+ * 	5.yyyy-MM-dd
+ *
+ * + * + * @author + * @date + */ +public class StringToDateUtil { + /** + * 日期格式化数组 + */ + private static DateFormat[] dateFormats = { + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss:S"), + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"), + new SimpleDateFormat("yyyy-MM-dd HH:mm"), + new SimpleDateFormat("yyyy-MM-dd HH"), + new SimpleDateFormat("yyyy-MM-dd"), + new SimpleDateFormat("yyyy-MM") + }; + + /** + * + * 
+     * 1.如果日期字符串为空,则直接返回空
+     * 2.使用格式化组进行格式化,如果解析成功,则直接返回
+     * 4.否则,抛出非法参数异常
+     * @param source 请求的日期参数
+     * @return 解析后的日期类型:java.util.Date
+     * @exception IllegalArgumentException 非法参数异常
+     *
+ * + */ + public static Date convert(String source) { + if (StringUtils.isBlank(source)) { + return null; + } + source = source.trim(); + + try { + int timeLength = source.length(); + Long time = Long.parseLong(source); + if (timeLength == 10) { + time = time * 1000; + } + Date date = new Date(time); + return date; + } catch (Exception e) { + + } + + Date date = null; + boolean flag = false; + for (DateFormat dateFormat : dateFormats) { + try { + date = dateFormat.parse(source); + flag = true; + break; + } catch (ParseException e) { + // e.printStackTrace(); + } + } + + if (flag) { + return date; + } else { + throw new IllegalArgumentException("不能解析日期:" + source); + } + + } +} diff --git a/src/main/java/com/soft/line/util/jackson/converter/StringToDoubleConverter.java b/src/main/java/com/soft/line/util/jackson/converter/StringToDoubleConverter.java new file mode 100644 index 0000000..f12a323 --- /dev/null +++ b/src/main/java/com/soft/line/util/jackson/converter/StringToDoubleConverter.java @@ -0,0 +1,19 @@ +package com.soft.line.util.jackson.converter; + +import org.springframework.core.convert.converter.Converter; + +/** + * + * + * + * + * @author + * @date + */ +public class StringToDoubleConverter implements Converter { + + @Override + public Double convert(String source) { + return StringToDoubleUtil.convert(source); + } +} diff --git a/src/main/java/com/soft/line/util/jackson/converter/StringToDoubleUtil.java b/src/main/java/com/soft/line/util/jackson/converter/StringToDoubleUtil.java new file mode 100644 index 0000000..583941c --- /dev/null +++ b/src/main/java/com/soft/line/util/jackson/converter/StringToDoubleUtil.java @@ -0,0 +1,26 @@ +package com.soft.line.util.jackson.converter; + + +import org.apache.commons.lang3.StringUtils; + +/** + * + * 
+ * 空字符串("")转换成Double的null
+ *
+ *
+ * + * + * @author + * @date + */ +public class StringToDoubleUtil { + + public static Double convert(String source) { + if (StringUtils.isBlank(source)) { + return null; + } + Double d = Double.parseDouble(source); + return d; + } +} diff --git a/src/main/java/com/soft/line/util/jackson/converter/StringToIntegerConverter.java b/src/main/java/com/soft/line/util/jackson/converter/StringToIntegerConverter.java new file mode 100644 index 0000000..4dd0c7e --- /dev/null +++ b/src/main/java/com/soft/line/util/jackson/converter/StringToIntegerConverter.java @@ -0,0 +1,19 @@ +package com.soft.line.util.jackson.converter; + +import org.springframework.core.convert.converter.Converter; + +/** + * + * + * + * + * @author + * @date + */ +public class StringToIntegerConverter implements Converter { + + @Override + public Integer convert(String source) { + return StringToIntegerUtil.convert(source); + } +} diff --git a/src/main/java/com/soft/line/util/jackson/converter/StringToIntegerUtil.java b/src/main/java/com/soft/line/util/jackson/converter/StringToIntegerUtil.java new file mode 100644 index 0000000..f264f3a --- /dev/null +++ b/src/main/java/com/soft/line/util/jackson/converter/StringToIntegerUtil.java @@ -0,0 +1,41 @@ +/* + * Copyright 2019-2029 TuMingLong(https://github.com/TuMingLong) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.soft.line.util.jackson.converter; + +import org.apache.commons.lang3.StringUtils; + +/** + * + * 
+ * 空字符串("")转换成Integer的null
+ *
+ *
+ * + * + * @author + * @date + */ +public class StringToIntegerUtil { + + public static Integer convert(String source) { + if (StringUtils.isBlank(source)) { + return null; + } + Integer i = Integer.parseInt(source); + return i; + } +} diff --git a/src/main/java/com/soft/line/xss/HTMLFilter.java b/src/main/java/com/soft/line/xss/HTMLFilter.java new file mode 100644 index 0000000..825f321 --- /dev/null +++ b/src/main/java/com/soft/line/xss/HTMLFilter.java @@ -0,0 +1,554 @@ +package com.soft.line.xss; + +import java.util.*; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; +import java.util.logging.Logger; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +/** + * HTML filtering utility for protecting against XSS (Cross Site Scripting). + *

+ * This code is licensed LGPLv3 + *

+ * This code is a Java port of the original work in PHP by Cal Hendersen. + * http://code.iamcal.com/php/lib_filter/ + *

+ * The trickiest part of the translation was handling the differences in regex handling + * between PHP and Java. These resources were helpful in the process: + *

+ * http://java.sun.com/j2se/1.4.2/docs/api/java/util/regex/Pattern.html + * http://us2.php.net/manual/en/reference.pcre.pattern.modifiers.php + * http://www.regular-expressions.info/modifiers.html + *

+ * A note on naming conventions: instance variables are prefixed with a "v"; global + * constants are in all caps. + *

+ * Sample use: + * String input = ... + * String clean = new HTMLFilter().filter( input ); + *

+ * The class is not thread safe. Create a new instance if in doubt. + *

+ * If you find bugs or have suggestions on improvement (especially regarding + * performance), please contact us. The latest version of this + * source, and our contact details, can be found at http://xss-html-filter.sf.net + * + * @author Joseph O'Connell + * @author Cal Hendersen + * @author Michael Semb Wever + */ +public final class HTMLFilter { + + /** + * regex flag union representing /si modifiers in php + **/ + private static final int REGEX_FLAGS_SI = Pattern.CASE_INSENSITIVE | Pattern.DOTALL; + private static final Pattern P_COMMENTS = Pattern.compile("", Pattern.DOTALL); + private static final Pattern P_COMMENT = Pattern.compile("^!--(.*)--$", REGEX_FLAGS_SI); + private static final Pattern P_TAGS = Pattern.compile("<(.*?)>", Pattern.DOTALL); + private static final Pattern P_END_TAG = Pattern.compile("^/([a-z0-9]+)", REGEX_FLAGS_SI); + private static final Pattern P_START_TAG = Pattern.compile("^([a-z0-9]+)(.*?)(/?)$", REGEX_FLAGS_SI); + private static final Pattern P_QUOTED_ATTRIBUTES = Pattern.compile("([a-z0-9]+)=([\"'])(.*?)\\2", REGEX_FLAGS_SI); + private static final Pattern P_UNQUOTED_ATTRIBUTES = Pattern.compile("([a-z0-9]+)(=)([^\"\\s']+)", REGEX_FLAGS_SI); + private static final Pattern P_PROTOCOL = Pattern.compile("^([^:]+):", REGEX_FLAGS_SI); + private static final Pattern P_ENTITY = Pattern.compile("&#(\\d+);?"); + private static final Pattern P_ENTITY_UNICODE = Pattern.compile("&#x([0-9a-f]+);?"); + private static final Pattern P_ENCODE = Pattern.compile("%([0-9a-f]{2});?"); + private static final Pattern P_VALID_ENTITIES = Pattern.compile("&([^&;]*)(?=(;|&|$))"); + private static final Pattern P_VALID_QUOTES = Pattern.compile("(>|^)([^<]+?)(<|$)", Pattern.DOTALL); + private static final Pattern P_END_ARROW = Pattern.compile("^>"); + private static final Pattern P_BODY_TO_END = Pattern.compile("<([^>]*?)(?=<|$)"); + private static final Pattern P_XML_CONTENT = Pattern.compile("(^|>)([^<]*?)(?=>)"); + private static final Pattern P_STRAY_LEFT_ARROW = Pattern.compile("<([^>]*?)(?=<|$)"); + private static final Pattern P_STRAY_RIGHT_ARROW = Pattern.compile("(^|>)([^<]*?)(?=>)"); + private static final Pattern P_AMP = Pattern.compile("&"); + private static final Pattern P_QUOTE = Pattern.compile("<"); + private static final Pattern P_LEFT_ARROW = Pattern.compile("<"); + private static final Pattern P_RIGHT_ARROW = Pattern.compile(">"); + private static final Pattern P_BOTH_ARROWS = Pattern.compile("<>"); + + // @xxx could grow large... maybe use sesat's ReferenceMap + private static final ConcurrentMap P_REMOVE_PAIR_BLANKS = new ConcurrentHashMap(); + private static final ConcurrentMap P_REMOVE_SELF_BLANKS = new ConcurrentHashMap(); + + /** + * set of allowed html elements, along with allowed attributes for each element + **/ + private final Map> vAllowed; + /** + * counts of open tags for each (allowable) html element + **/ + private final Map vTagCounts = new HashMap(); + + /** + * html elements which must always be self-closing (e.g. "") + **/ + private final String[] vSelfClosingTags; + /** + * html elements which must always have separate opening and closing tags (e.g. "") + **/ + private final String[] vNeedClosingTags; + /** + * set of disallowed html elements + **/ + private final String[] vDisallowed; + /** + * attributes which should be checked for valid protocols + **/ + private final String[] vProtocolAtts; + /** + * allowed protocols + **/ + private final String[] vAllowedProtocols; + /** + * tags which should be removed if they contain no content (e.g. "" or "") + **/ + private final String[] vRemoveBlanks; + /** + * entities allowed within html markup + **/ + private final String[] vAllowedEntities; + /** + * flag determining whether comments are allowed in input String. + */ + private final boolean stripComment; + private final boolean encodeQuotes; + private boolean vDebug = false; + /** + * flag determining whether to try to make tags when presented with "unbalanced" + * angle brackets (e.g. "" becomes " text "). If set to false, + * unbalanced angle brackets will be html escaped. + */ + private final boolean alwaysMakeTags; + + /** + * Default constructor. + */ + public HTMLFilter() { + vAllowed = new HashMap<>(); + + final ArrayList a_atts = new ArrayList(); + a_atts.add("href"); + a_atts.add("target"); + vAllowed.put("a", a_atts); + + final ArrayList img_atts = new ArrayList(); + img_atts.add("src"); + img_atts.add("width"); + img_atts.add("height"); + img_atts.add("alt"); + vAllowed.put("img", img_atts); + + final ArrayList no_atts = new ArrayList(); + vAllowed.put("b", no_atts); + vAllowed.put("strong", no_atts); + vAllowed.put("i", no_atts); + vAllowed.put("em", no_atts); + + vSelfClosingTags = new String[]{"img"}; + vNeedClosingTags = new String[]{"a", "b", "strong", "i", "em"}; + vDisallowed = new String[]{}; + vAllowedProtocols = new String[]{"http", "mailto", "https"}; // no ftp. + vProtocolAtts = new String[]{"src", "href"}; + vRemoveBlanks = new String[]{"a", "b", "strong", "i", "em"}; + vAllowedEntities = new String[]{"amp", "gt", "lt", "quot"}; + stripComment = true; + encodeQuotes = true; + alwaysMakeTags = true; + } + + /** + * Set debug flag to true. Otherwise use default settings. See the default constructor. + * + * @param debug turn debug on with a true argument + */ + public HTMLFilter(final boolean debug) { + this(); + vDebug = debug; + + } + + /** + * Map-parameter configurable constructor. + * + * @param conf map containing configuration. keys match field names. + */ + public HTMLFilter(final Map conf) { + + assert conf.containsKey("vAllowed") : "configuration requires vAllowed"; + assert conf.containsKey("vSelfClosingTags") : "configuration requires vSelfClosingTags"; + assert conf.containsKey("vNeedClosingTags") : "configuration requires vNeedClosingTags"; + assert conf.containsKey("vDisallowed") : "configuration requires vDisallowed"; + assert conf.containsKey("vAllowedProtocols") : "configuration requires vAllowedProtocols"; + assert conf.containsKey("vProtocolAtts") : "configuration requires vProtocolAtts"; + assert conf.containsKey("vRemoveBlanks") : "configuration requires vRemoveBlanks"; + assert conf.containsKey("vAllowedEntities") : "configuration requires vAllowedEntities"; + + vAllowed = Collections.unmodifiableMap((HashMap>) conf.get("vAllowed")); + vSelfClosingTags = (String[]) conf.get("vSelfClosingTags"); + vNeedClosingTags = (String[]) conf.get("vNeedClosingTags"); + vDisallowed = (String[]) conf.get("vDisallowed"); + vAllowedProtocols = (String[]) conf.get("vAllowedProtocols"); + vProtocolAtts = (String[]) conf.get("vProtocolAtts"); + vRemoveBlanks = (String[]) conf.get("vRemoveBlanks"); + vAllowedEntities = (String[]) conf.get("vAllowedEntities"); + stripComment = conf.containsKey("stripComment") ? (Boolean) conf.get("stripComment") : true; + encodeQuotes = conf.containsKey("encodeQuotes") ? (Boolean) conf.get("encodeQuotes") : true; + alwaysMakeTags = conf.containsKey("alwaysMakeTags") ? (Boolean) conf.get("alwaysMakeTags") : true; + } + + private void reset() { + vTagCounts.clear(); + } + + private void debug(final String msg) { + if (vDebug) { + Logger.getAnonymousLogger().info(msg); + } + } + + //--------------------------------------------------------------- + // my versions of some PHP library functions + public static String chr(final int decimal) { + return String.valueOf((char) decimal); + } + + public static String htmlSpecialChars(final String s) { + String result = s; + result = regexReplace(P_AMP, "&", result); + result = regexReplace(P_QUOTE, """, result); + result = regexReplace(P_LEFT_ARROW, "<", result); + result = regexReplace(P_RIGHT_ARROW, ">", result); + return result; + } + + //--------------------------------------------------------------- + + /** + * given a user submitted input String, filter out any invalid or restricted + * html. + * + * @param input text (i.e. submitted by a user) than may contain html + * @return "clean" version of input, with only valid, whitelisted html elements allowed + */ + public String filter(final String input) { + reset(); + String s = input; + + debug("************************************************"); + debug(" INPUT: " + input); + + s = escapeComments(s); + debug(" escapeComments: " + s); + + s = balanceHTML(s); + debug(" balanceHTML: " + s); + + s = checkTags(s); + debug(" checkTags: " + s); + + s = processRemoveBlanks(s); + debug("processRemoveBlanks: " + s); + + s = validateEntities(s); + debug(" validateEntites: " + s); + + debug("************************************************\n\n"); + return s; + } + + public boolean isAlwaysMakeTags() { + return alwaysMakeTags; + } + + public boolean isStripComments() { + return stripComment; + } + + private String escapeComments(final String s) { + final Matcher m = P_COMMENTS.matcher(s); + final StringBuffer buf = new StringBuffer(); + if (m.find()) { + final String match = m.group(1); //(.*?) + m.appendReplacement(buf, Matcher.quoteReplacement("")); + } + m.appendTail(buf); + + return buf.toString(); + } + + private String balanceHTML(String s) { + if (alwaysMakeTags) { + // + // try and form html + // + s = regexReplace(P_END_ARROW, "", s); + s = regexReplace(P_BODY_TO_END, "<$1>", s); + s = regexReplace(P_XML_CONTENT, "$1<$2", s); + + } else { + // + // escape stray brackets + // + s = regexReplace(P_STRAY_LEFT_ARROW, "<$1", s); + s = regexReplace(P_STRAY_RIGHT_ARROW, "$1$2><", s); + + // + // the last regexp causes '<>' entities to appear + // (we need to do a lookahead assertion so that the last bracket can + // be used in the next pass of the regexp) + // + s = regexReplace(P_BOTH_ARROWS, "", s); + } + + return s; + } + + private String checkTags(String s) { + Matcher m = P_TAGS.matcher(s); + + final StringBuffer buf = new StringBuffer(); + while (m.find()) { + String replaceStr = m.group(1); + replaceStr = processTag(replaceStr); + m.appendReplacement(buf, Matcher.quoteReplacement(replaceStr)); + } + m.appendTail(buf); + + s = buf.toString(); + + // these get tallied in processTag + // (remember to reset before subsequent calls to filter method) + for (String key : vTagCounts.keySet()) { + for (int ii = 0; ii < vTagCounts.get(key); ii++) { + s += ""; + } + } + + return s; + } + + private String processRemoveBlanks(final String s) { + String result = s; + for (String tag : vRemoveBlanks) { + if (!P_REMOVE_PAIR_BLANKS.containsKey(tag)) { + P_REMOVE_PAIR_BLANKS.putIfAbsent(tag, Pattern.compile("<" + tag + "(\\s[^>]*)?>")); + } + result = regexReplace(P_REMOVE_PAIR_BLANKS.get(tag), "", result); + if (!P_REMOVE_SELF_BLANKS.containsKey(tag)) { + P_REMOVE_SELF_BLANKS.putIfAbsent(tag, Pattern.compile("<" + tag + "(\\s[^>]*)?/>")); + } + result = regexReplace(P_REMOVE_SELF_BLANKS.get(tag), "", result); + } + + return result; + } + + private static String regexReplace(final Pattern regex_pattern, final String replacement, final String s) { + Matcher m = regex_pattern.matcher(s); + return m.replaceAll(replacement); + } + + private String processTag(final String s) { + // ending tags + Matcher m = P_END_TAG.matcher(s); + if (m.find()) { + final String name = m.group(1).toLowerCase(); + if (allowed(name)) { + if (!inArray(name, vSelfClosingTags)) { + if (vTagCounts.containsKey(name)) { + vTagCounts.put(name, vTagCounts.get(name) - 1); + return ""; + } + } + } + } + + // starting tags + m = P_START_TAG.matcher(s); + if (m.find()) { + final String name = m.group(1).toLowerCase(); + final String body = m.group(2); + String ending = m.group(3); + + //debug( "in a starting tag, name='" + name + "'; body='" + body + "'; ending='" + ending + "'" ); + if (allowed(name)) { + String params = ""; + + final Matcher m2 = P_QUOTED_ATTRIBUTES.matcher(body); + final Matcher m3 = P_UNQUOTED_ATTRIBUTES.matcher(body); + final List paramNames = new ArrayList(); + final List paramValues = new ArrayList(); + while (m2.find()) { + paramNames.add(m2.group(1)); //([a-z0-9]+) + paramValues.add(m2.group(3)); //(.*?) + } + while (m3.find()) { + paramNames.add(m3.group(1)); //([a-z0-9]+) + paramValues.add(m3.group(3)); //([^\"\\s']+) + } + + String paramName, paramValue; + for (int ii = 0; ii < paramNames.size(); ii++) { + paramName = paramNames.get(ii).toLowerCase(); + paramValue = paramValues.get(ii); + +// debug( "paramName='" + paramName + "'" ); +// debug( "paramValue='" + paramValue + "'" ); +// debug( "allowed? " + vAllowed.get( name ).contains( paramName ) ); + + if (allowedAttribute(name, paramName)) { + if (inArray(paramName, vProtocolAtts)) { + paramValue = processParamProtocol(paramValue); + } + params += " " + paramName + "=\"" + paramValue + "\""; + } + } + + if (inArray(name, vSelfClosingTags)) { + ending = " /"; + } + + if (inArray(name, vNeedClosingTags)) { + ending = ""; + } + + if (ending == null || ending.length() < 1) { + if (vTagCounts.containsKey(name)) { + vTagCounts.put(name, vTagCounts.get(name) + 1); + } else { + vTagCounts.put(name, 1); + } + } else { + ending = " /"; + } + return "<" + name + params + ending + ">"; + } else { + return ""; + } + } + + // comments + m = P_COMMENT.matcher(s); + if (!stripComment && m.find()) { + return "<" + m.group() + ">"; + } + + return ""; + } + + private String processParamProtocol(String s) { + s = decodeEntities(s); + final Matcher m = P_PROTOCOL.matcher(s); + if (m.find()) { + final String protocol = m.group(1); + if (!inArray(protocol, vAllowedProtocols)) { + // bad protocol, turn into local anchor link instead + s = "#" + s.substring(protocol.length() + 1, s.length()); + if (s.startsWith("#//")) { + s = "#" + s.substring(3, s.length()); + } + } + } + + return s; + } + + private String decodeEntities(String s) { + StringBuffer buf = new StringBuffer(); + + Matcher m = P_ENTITY.matcher(s); + while (m.find()) { + final String match = m.group(1); + final int decimal = Integer.decode(match).intValue(); + m.appendReplacement(buf, Matcher.quoteReplacement(chr(decimal))); + } + m.appendTail(buf); + s = buf.toString(); + + buf = new StringBuffer(); + m = P_ENTITY_UNICODE.matcher(s); + while (m.find()) { + final String match = m.group(1); + final int decimal = Integer.valueOf(match, 16).intValue(); + m.appendReplacement(buf, Matcher.quoteReplacement(chr(decimal))); + } + m.appendTail(buf); + s = buf.toString(); + + buf = new StringBuffer(); + m = P_ENCODE.matcher(s); + while (m.find()) { + final String match = m.group(1); + final int decimal = Integer.valueOf(match, 16).intValue(); + m.appendReplacement(buf, Matcher.quoteReplacement(chr(decimal))); + } + m.appendTail(buf); + s = buf.toString(); + + s = validateEntities(s); + return s; + } + + private String validateEntities(final String s) { + StringBuffer buf = new StringBuffer(); + + // validate entities throughout the string + Matcher m = P_VALID_ENTITIES.matcher(s); + while (m.find()) { + final String one = m.group(1); //([^&;]*) + final String two = m.group(2); //(?=(;|&|$)) + m.appendReplacement(buf, Matcher.quoteReplacement(checkEntity(one, two))); + } + m.appendTail(buf); + + return encodeQuotes(buf.toString()); + } + + private String encodeQuotes(final String s) { + if (encodeQuotes) { + StringBuffer buf = new StringBuffer(); + Matcher m = P_VALID_QUOTES.matcher(s); + while (m.find()) { + final String one = m.group(1); //(>|^) + final String two = m.group(2); //([^<]+?) + final String three = m.group(3); //(<|$) + m.appendReplacement(buf, Matcher.quoteReplacement(one + regexReplace(P_QUOTE, """, two) + three)); + } + m.appendTail(buf); + return buf.toString(); + } else { + return s; + } + } + + private String checkEntity(final String preamble, final String term) { + + return ";".equals(term) && isValidEntity(preamble) + ? '&' + preamble + : "&" + preamble; + } + + private boolean isValidEntity(final String entity) { + return inArray(entity, vAllowedEntities); + } + + private static boolean inArray(final String s, final String[] array) { + for (String item : array) { + if (item != null && item.equals(s)) { + return true; + } + } + return false; + } + + private boolean allowed(final String name) { + return (vAllowed.isEmpty() || vAllowed.containsKey(name)) && !inArray(name, vDisallowed); + } + + private boolean allowedAttribute(final String name, final String paramName) { + return allowed(name) && (vAllowed.isEmpty() || vAllowed.get(name).contains(paramName)); + } +} \ No newline at end of file diff --git a/src/main/java/com/soft/line/xss/XssFilter.java b/src/main/java/com/soft/line/xss/XssFilter.java new file mode 100644 index 0000000..9add1a5 --- /dev/null +++ b/src/main/java/com/soft/line/xss/XssFilter.java @@ -0,0 +1,35 @@ +package com.soft.line.xss; + +import lombok.extern.slf4j.Slf4j; + +import javax.servlet.*; +import javax.servlet.annotation.WebFilter; +import javax.servlet.http.HttpServletRequest; +import java.io.IOException; + +/** + * @Description Xss过滤器 + * @Author wu.xueqiao + * @Date 2020/05/08 12:47 + */ +@Slf4j +@WebFilter(filterName = "xssFilter", urlPatterns = "/*", asyncSupported = true) +public class XssFilter implements Filter { + @Override + public void init(FilterConfig filterConfig) throws ServletException { + log.debug("-----XssFilter init-----"); + + } + + @Override + public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException { + HttpServletRequest request = (HttpServletRequest) servletRequest; + XssHttpServletRequestWrapper xssHttpServletRequestWrapper = new XssHttpServletRequestWrapper(request); + filterChain.doFilter(xssHttpServletRequestWrapper, servletResponse); + } + + @Override + public void destroy() { + + } +} diff --git a/src/main/java/com/soft/line/xss/XssHttpServletRequestWrapper.java b/src/main/java/com/soft/line/xss/XssHttpServletRequestWrapper.java new file mode 100644 index 0000000..feab9dd --- /dev/null +++ b/src/main/java/com/soft/line/xss/XssHttpServletRequestWrapper.java @@ -0,0 +1,45 @@ +package com.soft.line.xss; + +import org.apache.commons.lang3.ArrayUtils; +import org.apache.commons.text.StringEscapeUtils; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletRequestWrapper; + + +/** + * @Description XSS 跨站脚本攻击(Cross Site Scripting) 处理 + * @Author TuMingLong + * @Date 2020/4/1 17:35 + */ +public class XssHttpServletRequestWrapper extends HttpServletRequestWrapper { + + public XssHttpServletRequestWrapper(HttpServletRequest request) { + super(request); + } + + @Override + public String getQueryString() { + return StringEscapeUtils.escapeHtml4(super.getQueryString()); + } + + @Override + public String getParameter(String name) { + return StringEscapeUtils.escapeHtml4(super.getParameter(name)); + } + + @Override + public String[] getParameterValues(String name) { + String[] values = super.getParameterValues(name); + if (ArrayUtils.isEmpty(values)) { + return values; + } + int length = values.length; + String[] escapeValues = new String[length]; + for (int i = 0; i < length; i++) { + escapeValues[i] = StringEscapeUtils.escapeHtml4(values[i]); + } + return escapeValues; + } + +} diff --git a/src/main/java/com/soft/line/xss/XssJacksonDeserializer.java b/src/main/java/com/soft/line/xss/XssJacksonDeserializer.java new file mode 100644 index 0000000..5104ce1 --- /dev/null +++ b/src/main/java/com/soft/line/xss/XssJacksonDeserializer.java @@ -0,0 +1,24 @@ +package com.soft.line.xss; + +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.DeserializationContext; +import com.fasterxml.jackson.databind.JsonDeserializer; +import org.apache.commons.text.StringEscapeUtils; + +import java.io.IOException; + + +/** + * @Description Jackson请求参数字符串转义处理 + * @Author wu.xueqiao + * @Date 2020/05/08 12:47 + */ +public class XssJacksonDeserializer extends JsonDeserializer { + + @Override + public String deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException, JsonProcessingException { + return StringEscapeUtils.escapeHtml4(jsonParser.getText()); + } + +} diff --git a/src/main/java/com/soft/line/xss/XssJacksonSerializer.java b/src/main/java/com/soft/line/xss/XssJacksonSerializer.java new file mode 100644 index 0000000..e631698 --- /dev/null +++ b/src/main/java/com/soft/line/xss/XssJacksonSerializer.java @@ -0,0 +1,24 @@ +package com.soft.line.xss; + +import com.fasterxml.jackson.core.JsonGenerator; +import com.fasterxml.jackson.databind.JsonSerializer; +import com.fasterxml.jackson.databind.SerializerProvider; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.text.StringEscapeUtils; + +import java.io.IOException; + +/** + * @Description Jackson响应参数字符串转义处理 + * @Author wu.xueqiao + * @Date 2020/05/08 12:47 + */ +@Slf4j +public class XssJacksonSerializer extends JsonSerializer { + + @Override + public void serialize(String s, JsonGenerator jsonGenerator, SerializerProvider serializerProvider) throws IOException { + jsonGenerator.writeString(StringEscapeUtils.escapeHtml4(s)); + } + +} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties new file mode 100644 index 0000000..0d78995 --- /dev/null +++ b/src/main/resources/application.properties @@ -0,0 +1,10 @@ +server.port=9100 +spring.datasource.url= jdbc:mysql://localhost:3306/rz_archives +spring.datasource.username=root +spring.datasource.password=root +spring.datasource.driver-class-name=com.mysql.jdbc.Driver + +#mybatisӳļ· +#mybatis.mapper-locations=com.soft.line.mapper/*.xml +#ʵ· +mybatis.type-aliases-package=com.soft.line.entity \ No newline at end of file diff --git a/src/test/java/com/soft/line/SoftlineFilesManageApplicationTests.java b/src/test/java/com/soft/line/SoftlineFilesManageApplicationTests.java new file mode 100644 index 0000000..e27def9 --- /dev/null +++ b/src/test/java/com/soft/line/SoftlineFilesManageApplicationTests.java @@ -0,0 +1,13 @@ +package com.soft.line; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class SoftlineFilesManageApplicationTests { + + @Test + void contextLoads() { + } + +} -- Gitee From d7f5700b3e574599d886ca96cd5b7628faf5d0a5 Mon Sep 17 00:00:00 2001 From: wuxueqiao <7382074+wuxueqiao@user.noreply.gitee.com> Date: Fri, 8 May 2020 16:23:48 +0800 Subject: [PATCH 005/211] add README.md. --- README.md | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..3b9aa01 --- /dev/null +++ b/README.md @@ -0,0 +1,40 @@ +# softline-files-manage + + + + +#### 介绍 +PC端 + +#### 软件架构 +软件架构说明 + + +#### 安装教程 + +1. xxxx +2. xxxx +3. xxxx + +#### 使用说明 + +1. xxxx +2. xxxx +3. xxxx + +#### 参与贡献 + +1. Fork 本仓库 +2. 新建 Feat_xxx 分支 +3. 提交代码 +4. 新建 Pull Request + + +#### 码云特技 + +1. 使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md +2. 码云官方博客 [blog.gitee.com](https://blog.gitee.com) +3. 你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解码云上的优秀开源项目 +4. [GVP](https://gitee.com/gvp) 全称是码云最有价值开源项目，是码云综合评定出的优秀开源项目 +5. 码云官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help) +6. 码云封面人物是一档用来展示码云会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) -- Gitee From 5c8c2ff87973fed557294d3f9c4c281f15909264 Mon Sep 17 00:00:00 2001 From: wuxueqiao <17625808004@163.com> Date: Fri, 8 May 2020 17:08:26 +0800 Subject: [PATCH 006/211] =?UTF-8?q?=E5=A2=9E=E5=8A=A0url=20=E8=AE=BF?= =?UTF-8?q?=E9=97=AE=E5=89=8D=E7=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/soft/line/mapper/CertificateInfoMapper.xml | 2 +- src/main/resources/application.properties | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/soft/line/mapper/CertificateInfoMapper.xml b/src/main/java/com/soft/line/mapper/CertificateInfoMapper.xml index 54ff612..3b0cd30 100644 --- a/src/main/java/com/soft/line/mapper/CertificateInfoMapper.xml +++ b/src/main/java/com/soft/line/mapper/CertificateInfoMapper.xml @@ -56,6 +56,6 @@ select `id`, `cert_id`, `cert_type`, `cert_name`, `cert_unit`, `begin_date`, `end_date`, `cert_attachment`, `note`, `modify_person`, `modify_time` from `certificate_info` - WHERE instr(`cert_name`,userName)>0 + WHERE instr(`cert_name`,#{userName，jdbcType=VARCHAR})>0 \ No newline at end of file diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 0d78995..b951b81 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,4 +1,5 @@ server.port=9100 +server.servlet.context-path=/softline spring.datasource.url= jdbc:mysql://localhost:3306/rz_archives spring.datasource.username=root spring.datasource.password=root -- Gitee From 53d9d15b2c30280269fd80cd4b186ea78dbd5f13 Mon Sep 17 00:00:00 2001 From: wuxueqiao <17625808004@163.com> Date: Mon, 11 May 2020 13:31:55 +0800 Subject: [PATCH 007/211] =?UTF-8?q?Xss=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/soft/line/xss/XssHttpServletRequestWrapper.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/java/com/soft/line/xss/XssHttpServletRequestWrapper.java b/src/main/java/com/soft/line/xss/XssHttpServletRequestWrapper.java index feab9dd..c15428a 100644 --- a/src/main/java/com/soft/line/xss/XssHttpServletRequestWrapper.java +++ b/src/main/java/com/soft/line/xss/XssHttpServletRequestWrapper.java @@ -9,8 +9,6 @@ import javax.servlet.http.HttpServletRequestWrapper; /** * @Description XSS 跨站脚本攻击(Cross Site Scripting) 处理 - * @Author TuMingLong - * @Date 2020/4/1 17:35 */ public class XssHttpServletRequestWrapper extends HttpServletRequestWrapper { -- Gitee From f54fb87c9c61f7a3a5b062b6ac333dad9337fdc8 Mon Sep 17 00:00:00 2001 From: wuxueqiao <17625808004@163.com> Date: Mon, 11 May 2020 13:37:43 +0800 Subject: [PATCH 008/211] =?UTF-8?q?=E6=B7=BB=E5=8A=A0pom=E7=9A=84aop?= =?UTF-8?q?=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pom.xml b/pom.xml index d2ef898..359405f 100644 --- a/pom.xml +++ b/pom.xml @@ -111,6 +111,12 @@ springfox-swagger-ui 2.5.0 + + + + org.springframework.boot + spring-boot-starter-aop + -- Gitee From 0295a7eb8e35695e2120c014eefe96e78cd54358 Mon Sep 17 00:00:00 2001 From: wuxueqiao <17625808004@163.com> Date: Mon, 11 May 2020 15:58:33 +0800 Subject: [PATCH 009/211] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93=E8=BF=9E=E6=8E=A5=E6=B1=A0=20druid=20=E4=BB=A5?= =?UTF-8?q?=E5=8F=8A=E7=9B=B8=E5=85=B3=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 12 +++++++ .../line/SoftlineFilesManageApplication.java | 2 ++ .../java/com/soft/line/druid/DruidConfig.java | 31 +++++++++++++++++++ .../java/com/soft/line/druid/DruidFilter.java | 18 +++++++++++ .../com/soft/line/druid/DruidServlet.java | 23 ++++++++++++++ .../java/com/soft/line/xss/XssFilter.java | 2 ++ src/main/resources/application.properties | 17 ++++++++++ src/main/resources/log4j.properties | 10 ++++++ 8 files changed, 115 insertions(+) create mode 100644 src/main/java/com/soft/line/druid/DruidConfig.java create mode 100644 src/main/java/com/soft/line/druid/DruidFilter.java create mode 100644 src/main/java/com/soft/line/druid/DruidServlet.java create mode 100644 src/main/resources/log4j.properties diff --git a/pom.xml b/pom.xml index 359405f..731c1cd 100644 --- a/pom.xml +++ b/pom.xml @@ -117,6 +117,18 @@ org.springframework.boot spring-boot-starter-aop + + + + com.alibaba + druid + 1.1.10 + + + log4j + log4j + 1.2.17 + diff --git a/src/main/java/com/soft/line/SoftlineFilesManageApplication.java b/src/main/java/com/soft/line/SoftlineFilesManageApplication.java index cf18d73..a95de5d 100644 --- a/src/main/java/com/soft/line/SoftlineFilesManageApplication.java +++ b/src/main/java/com/soft/line/SoftlineFilesManageApplication.java @@ -4,10 +4,12 @@ import lombok.extern.slf4j.Slf4j; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.web.servlet.ServletComponentScan; @SpringBootApplication @MapperScan(basePackages = "com.soft.line.mapper") @Slf4j +@ServletComponentScan public class SoftlineFilesManageApplication { public static void main(String[] args) { diff --git a/src/main/java/com/soft/line/druid/DruidConfig.java b/src/main/java/com/soft/line/druid/DruidConfig.java new file mode 100644 index 0000000..21384f2 --- /dev/null +++ b/src/main/java/com/soft/line/druid/DruidConfig.java @@ -0,0 +1,31 @@ +package com.soft.line.druid; + +import com.alibaba.druid.pool.DruidDataSource; +import com.alibaba.druid.support.http.StatViewServlet; +import com.alibaba.druid.support.http.WebStatFilter; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.boot.web.servlet.FilterRegistrationBean; +import org.springframework.boot.web.servlet.ServletRegistrationBean; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +import javax.servlet.FilterRegistration; +import javax.sql.DataSource; +import java.util.Arrays; +import java.util.HashMap; +import java.util.Map; + +/** + * @author wu.xueqiao on 2020/5/11. + * @version 0.1 + */ +@Configuration +public class DruidConfig { + + @ConfigurationProperties(prefix = "spring.datasource") + @Bean + public DataSource druid() { + return new DruidDataSource(); + } +} + diff --git a/src/main/java/com/soft/line/druid/DruidFilter.java b/src/main/java/com/soft/line/druid/DruidFilter.java new file mode 100644 index 0000000..84fdeb8 --- /dev/null +++ b/src/main/java/com/soft/line/druid/DruidFilter.java @@ -0,0 +1,18 @@ +package com.soft.line.druid; + +import com.alibaba.druid.support.http.WebStatFilter; + +import javax.servlet.annotation.WebFilter; +import javax.servlet.annotation.WebInitParam; + +/** + * @author wu.xueqiao on 2020/5/11. + * @version 0.1 + */ +@WebFilter(filterName="druidWebStatFilter",urlPatterns="/*", + initParams={ + @WebInitParam(name="exclusions",value="*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/*")// 忽略资源 + }) +public class DruidFilter extends WebStatFilter { + +} diff --git a/src/main/java/com/soft/line/druid/DruidServlet.java b/src/main/java/com/soft/line/druid/DruidServlet.java new file mode 100644 index 0000000..aff6490 --- /dev/null +++ b/src/main/java/com/soft/line/druid/DruidServlet.java @@ -0,0 +1,23 @@ +package com.soft.line.druid; + +import com.alibaba.druid.support.http.StatViewServlet; +import org.springframework.context.annotation.Configuration; + +import javax.servlet.annotation.WebInitParam; +import javax.servlet.annotation.WebServlet; + +/** + * @author wu.xueqiao on 2020/5/11. + * @version 0.1 + */ +@WebServlet(urlPatterns = "/druid/*", + initParams={ + @WebInitParam(name="allow",value="127.0.0.1"),// IP白名单 (没有配置或者为空，则允许所有访问) + // @WebInitParam(name="deny",value="192.168.16.111"),// IP黑名单 (存在共同时，deny优先于allow) + @WebInitParam(name="loginUsername",value="admin"),// 用户名 + @WebInitParam(name="loginPassword",value="druid"),// 密码 + @WebInitParam(name="resetEnable",value="false")// 禁用HTML页面上的“Reset All”功能 + }) +public class DruidServlet extends StatViewServlet{ + //页面访问 http://localhost:9100/softline/druid/index.html +} diff --git a/src/main/java/com/soft/line/xss/XssFilter.java b/src/main/java/com/soft/line/xss/XssFilter.java index 9add1a5..a53afbc 100644 --- a/src/main/java/com/soft/line/xss/XssFilter.java +++ b/src/main/java/com/soft/line/xss/XssFilter.java @@ -1,6 +1,7 @@ package com.soft.line.xss; import lombok.extern.slf4j.Slf4j; +import org.springframework.core.annotation.Order; import javax.servlet.*; import javax.servlet.annotation.WebFilter; @@ -12,6 +13,7 @@ import java.io.IOException; * @Author wu.xueqiao * @Date 2020/05/08 12:47 */ +@Order(1) @Slf4j @WebFilter(filterName = "xssFilter", urlPatterns = "/*", asyncSupported = true) public class XssFilter implements Filter { diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index b951b81..ac4093a 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -4,6 +4,23 @@ spring.datasource.url= jdbc:mysql://localhost:3306/rz_archives spring.datasource.username=root spring.datasource.password=root spring.datasource.driver-class-name=com.mysql.jdbc.Driver +spring.datasource.type=com.alibaba.druid.pool.DruidDataSource +spring.datasource.druid.initialSize=5 +spring.datasource.druid.minIdle=5 +spring.datasource.druid.maxActive=20 +spring.datasource.druid.maxWait=60000 +spring.datasource.druid.timeBetweenEvictionRunsMillis=60000 +spring.datasource.druid.minEvictableIdleTimeMillis=300000 +spring.datasource.druid.validationQuery=SELECT?1?FROM?DUAL +spring.datasource.druid.testWhileIdle=true +spring.datasource.druid.testOnBorrow=false +spring.datasource.druid.testOnReturn=false +spring.datasource.druid.poolPreparedStatements=true +spring.datasource.druid.filters=stat,wall +spring.datasource.druid.maxPoolPreparedStatementPerConnectionSize=20 +spring.datasource.druid.useGlobalDataSourceStat=true +spring.datasource.druid.connectionProperties=druid.stat.mergeSql=true;druid.stat.slowSqlMillis=500 + #mybatisӳļ· #mybatis.mapper-locations=com.soft.line.mapper/*.xml diff --git a/src/main/resources/log4j.properties b/src/main/resources/log4j.properties new file mode 100644 index 0000000..014f7e3 --- /dev/null +++ b/src/main/resources/log4j.properties @@ -0,0 +1,10 @@ +log4j.rootLogger=debug, stdout, R +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%5p - %m%n +log4j.appender.R=org.apache.log4j.RollingFileAppender +log4j.appender.R.File=firestorm.log +log4j.appender.R.MaxFileSize=100KB +log4j.appender.R.MaxBackupIndex=1 +log4j.appender.R.layout=org.apache.log4j.PatternLayout +log4j.appender.R.layout.ConversionPattern=%p %t %c - %m%n \ No newline at end of file -- Gitee From 62c0509803e5bd7d131e08ff40699448b6865a1f Mon Sep 17 00:00:00 2001 From: ljc <1119265069@qq.com> Date: Mon, 11 May 2020 19:38:35 +0800 Subject: [PATCH 010/211] dd --- .../com/soft/line/controller/CertificateInfoController.java | 1 + src/main/java/com/soft/line/controller/LoginController.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/soft/line/controller/CertificateInfoController.java b/src/main/java/com/soft/line/controller/CertificateInfoController.java index 95bc9d0..a17f135 100644 --- a/src/main/java/com/soft/line/controller/CertificateInfoController.java +++ b/src/main/java/com/soft/line/controller/CertificateInfoController.java @@ -42,6 +42,7 @@ public class CertificateInfoController { }) @GetMapping("/getPersonalAll/{userName}") public CommonResult> getPersonalAll(@PathVariable("userName") String userName) { + return CommonResult.success(certificateInfoService.getPersonalAll(userName)); } diff --git a/src/main/java/com/soft/line/controller/LoginController.java b/src/main/java/com/soft/line/controller/LoginController.java index bb0912f..05dc4d7 100644 --- a/src/main/java/com/soft/line/controller/LoginController.java +++ b/src/main/java/com/soft/line/controller/LoginController.java @@ -18,7 +18,7 @@ public class LoginController { ResultData resultData=new ResultData(); - + //返回 return resultData; } -- Gitee From 895acb07fa043c69b343ce9b79b5ccbc3b4c06b3 Mon Sep 17 00:00:00 2001 From: ljc <1119265069@qq.com> Date: Mon, 11 May 2020 22:28:40 +0800 Subject: [PATCH 011/211] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=97=B6=E5=8C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index ac4093a..5170aaa 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,6 +1,6 @@ server.port=9100 server.servlet.context-path=/softline -spring.datasource.url= jdbc:mysql://localhost:3306/rz_archives +spring.datasource.url= jdbc:mysql://localhost:3306/rz_archives?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai spring.datasource.username=root spring.datasource.password=root spring.datasource.driver-class-name=com.mysql.jdbc.Driver -- Gitee From 878201a9d5675c673061db7171f4929dc31c26c4 Mon Sep 17 00:00:00 2001 From: ljc <1119265069@qq.com> Date: Tue, 12 May 2020 00:01:13 +0800 Subject: [PATCH 012/211] =?UTF-8?q?=E9=85=8D=E7=BD=AEswagger?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 12 +++-- .../com/soft/line/config/SwaggerConfig.java | 47 +++++++++++++++++++ src/main/resources/application.properties | 4 +- 3 files changed, 59 insertions(+), 4 deletions(-) create mode 100644 src/main/java/com/soft/line/config/SwaggerConfig.java diff --git a/pom.xml b/pom.xml index 731c1cd..bf0da3d 100644 --- a/pom.xml +++ b/pom.xml @@ -94,6 +94,12 @@ lombok 1.18.12 + + @@ -164,15 +170,15 @@ - + + <!– 描述存放资源的目录，该路径相对POM路径–> src/main/java **/*.xml - + --> diff --git a/src/main/java/com/soft/line/config/SwaggerConfig.java b/src/main/java/com/soft/line/config/SwaggerConfig.java new file mode 100644 index 0000000..19b3b95 --- /dev/null +++ b/src/main/java/com/soft/line/config/SwaggerConfig.java @@ -0,0 +1,47 @@ +package com.soft.line.config; + +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import springfox.documentation.builders.ApiInfoBuilder; +import springfox.documentation.builders.PathSelectors; +import springfox.documentation.builders.RequestHandlerSelectors; +import springfox.documentation.service.ApiInfo; +import springfox.documentation.service.Contact; +import springfox.documentation.spi.DocumentationType; +import springfox.documentation.spring.web.plugins.Docket; +import springfox.documentation.swagger2.annotations.EnableSwagger2; + +/** + * Swagger配置 + */ +@EnableSwagger2 +@Configuration +public class SwaggerConfig { + /** + * 是否开启swagger，正式环境一般是需要关闭的，可根据springboot的多环境配置进行设置 + */ + @Value(value = "${swagger.enabled}") + Boolean swaggerEnabled; + + @Bean + public Docket createRestApi() { + return new Docket(DocumentationType.SWAGGER_2).apiInfo(apiInfo()) + // 是否开启 + .enable(swaggerEnabled).select() + // 扫描的路径包 + .apis(RequestHandlerSelectors.basePackage("com.soft.line")) + // 指定路径处理PathSelectors.any()代表所有的路径 + .paths(PathSelectors.any()).build().pathMapping("/"); + } + + private ApiInfo apiInfo() { + return new ApiInfoBuilder() + .title("shiro") + .description("ITAEM | LJC团队") + // 作者信息 + .contact(new Contact("ljc", "https://www.softline.sh.cn", "ljc@softline.sh.cn")) + .version("1.0.0") + .build(); + } +} \ No newline at end of file diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 5170aaa..7f2465a 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -25,4 +25,6 @@ spring.datasource.druid.connectionProperties=druid.stat.mergeSql=true;druid.stat #mybatisӳļ· #mybatis.mapper-locations=com.soft.line.mapper/*.xml #ʵ· -mybatis.type-aliases-package=com.soft.line.entity \ No newline at end of file +mybatis.type-aliases-package=com.soft.line.entity + +swagger.enabled=true \ No newline at end of file -- Gitee From 7b2f90bca33fbbaa77576da91239a51543ca466b Mon Sep 17 00:00:00 2001 From: wuxueqiao <17625808004@163.com> Date: Tue, 12 May 2020 15:40:11 +0800 Subject: [PATCH 013/211] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E6=8F=92=E4=BB=B6=EF=BC=8C=E4=BB=A5=E5=8F=8A=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E8=8C=83=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 123 +++++++++++++++++- .../controller/CertificateInfoController.java | 12 ++ .../line/mapper/CertificateInfoMapper.java | 3 + .../line/mapper/CertificateInfoMapper.xml | 5 + .../line/service/CertificateInfoService.java | 4 + .../impl/CertificateInfoServiceImpl.java | 13 ++ .../soft/line/util/pagehelper/PageBeans.java | 81 ++++++++++++ .../soft/line/util/pagehelper/PageUtil.java | 43 ++++++ 8 files changed, 281 insertions(+), 3 deletions(-) create mode 100644 src/main/java/com/soft/line/util/pagehelper/PageBeans.java create mode 100644 src/main/java/com/soft/line/util/pagehelper/PageUtil.java diff --git a/pom.xml b/pom.xml index 731c1cd..d100748 100644 --- a/pom.xml +++ b/pom.xml @@ -100,17 +100,35 @@ org.springframework.boot spring-boot-devtools + io.springfox springfox-swagger2 - 2.5.0 + 2.8.0 - io.springfox springfox-swagger-ui - 2.5.0 + 2.8.0 + + + io.github.swagger2markup + swagger2markup + 1.3.1 + + + nl.jworks.markdown_to_asciidoc + markdown_to_asciidoc + 1.0 + + + org.pegdown + pegdown + 1.6.0 + test + + @@ -129,10 +147,109 @@ log4j 1.2.17 + + + com.google.code.gson + gson + 2.6.2 + + + + io.jsonwebtoken + jjwt + 0.6.0 + + + + redis.clients + jedis + 2.9.0 + + + com.google.code.gson + gson + 2.8.6 + + + + + com.github.pagehelper + pagehelper + 5.1.11 + + + + io.github.swagger2markup + swagger2markup-maven-plugin + 1.3.1 + + + http://localhost:9100/softline/v2/api-docs + src/docs/asciidoc/generated + + + ASCIIDOC + + + + + + org.asciidoctor + asciidoctor-maven-plugin + 1.5.3 + + + + org.asciidoctor + asciidoctorj-pdf + 1.5.0-alpha.11 + + + org.jruby + jruby-complete + 1.7.21 + + + + + src/docs/asciidoc/generated + coderay + + left + + + + + + output-html + generate-resources + + process-asciidoc + + + html5 + src/docs/asciidoc/html + + + + output-pdf + generate-resources + + process-asciidoc + + + pdf + src/docs/asciidoc/pdf + + + + + org.springframework.boot spring-boot-maven-plugin diff --git a/src/main/java/com/soft/line/controller/CertificateInfoController.java b/src/main/java/com/soft/line/controller/CertificateInfoController.java index 95bc9d0..40a8cc2 100644 --- a/src/main/java/com/soft/line/controller/CertificateInfoController.java +++ b/src/main/java/com/soft/line/controller/CertificateInfoController.java @@ -1,8 +1,10 @@ package com.soft.line.controller; +import com.soft.line.aop.Permission; import com.soft.line.entity.CertificateInfo; import com.soft.line.service.CertificateInfoService; import com.soft.line.util.exception.CommonResult; +import com.soft.line.util.pagehelper.PageBeans; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -33,6 +35,8 @@ public class CertificateInfoController { + //设置访问权限 + @Permission @ApiOperation(value = "个人证书列表", notes = "证书列表") //设置请求参数 @ApiImplicitParams({ @@ -45,4 +49,12 @@ public class CertificateInfoController { return CommonResult.success(certificateInfoService.getPersonalAll(userName)); } + + + //map 封装请求分页参数 + @PostMapping("/getCompanyAllCertificates") + public PageBeans getCompanyAllCertificates(@RequestBody Map map){ + return certificateInfoService.getAllCompanyCertificates(map); + } + } diff --git a/src/main/java/com/soft/line/mapper/CertificateInfoMapper.java b/src/main/java/com/soft/line/mapper/CertificateInfoMapper.java index f04a340..ce1620e 100644 --- a/src/main/java/com/soft/line/mapper/CertificateInfoMapper.java +++ b/src/main/java/com/soft/line/mapper/CertificateInfoMapper.java @@ -4,6 +4,7 @@ import com.soft.line.entity.CertificateInfo; import org.apache.ibatis.annotations.Mapper; import java.util.List; +import java.util.Map; @Mapper public interface CertificateInfoMapper { @@ -33,4 +34,6 @@ public interface CertificateInfoMapper { List getPersonalAll(String userName); + + List getAllCompanyCertificates(Map map); } \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/CertificateInfoMapper.xml b/src/main/java/com/soft/line/mapper/CertificateInfoMapper.xml index 3b0cd30..a6ded55 100644 --- a/src/main/java/com/soft/line/mapper/CertificateInfoMapper.xml +++ b/src/main/java/com/soft/line/mapper/CertificateInfoMapper.xml @@ -58,4 +58,9 @@ from `certificate_info` WHERE instr(`cert_name`,#{userName，jdbcType=VARCHAR})>0 + \ No newline at end of file diff --git a/src/main/java/com/soft/line/service/CertificateInfoService.java b/src/main/java/com/soft/line/service/CertificateInfoService.java index 98bc6a7..673ea55 100644 --- a/src/main/java/com/soft/line/service/CertificateInfoService.java +++ b/src/main/java/com/soft/line/service/CertificateInfoService.java @@ -2,10 +2,12 @@ package com.soft.line.service; import com.soft.line.entity.CertificateInfo; import com.soft.line.mapper.CertificateInfoMapper; +import com.soft.line.util.pagehelper.PageBeans; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; +import java.util.Map; /** * @author wu.xueqiao on 2020/5/8. @@ -15,4 +17,6 @@ import java.util.List; public interface CertificateInfoService { public List getPersonalAll(String userName); + + public PageBeans getAllCompanyCertificates(Map map); } diff --git a/src/main/java/com/soft/line/service/impl/CertificateInfoServiceImpl.java b/src/main/java/com/soft/line/service/impl/CertificateInfoServiceImpl.java index 4070152..acadc20 100644 --- a/src/main/java/com/soft/line/service/impl/CertificateInfoServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/CertificateInfoServiceImpl.java @@ -1,13 +1,17 @@ package com.soft.line.service.impl; +import com.github.pagehelper.Page; import com.soft.line.entity.CertificateInfo; import com.soft.line.mapper.CertificateInfoMapper; import com.soft.line.service.CertificateInfoService; +import com.soft.line.util.pagehelper.PageBeans; +import com.soft.line.util.pagehelper.PageUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; +import java.util.Map; /** * @author wu.xueqiao on 2020/5/8. @@ -23,4 +27,13 @@ public class CertificateInfoServiceImpl implements CertificateInfoService { public List getPersonalAll(String userName) { return certificateInfoMapper.getPersonalAll(userName); } + + @Override + public PageBeans getAllCompanyCertificates(Map map) { + final Page> page = PageUtil.setPageParam(map); + List certificateInfos=certificateInfoMapper.getAllCompanyCertificates(map); + PageBeans beans = new PageBeans(certificateInfos); + beans.setList(certificateInfos); + return beans; + } } diff --git a/src/main/java/com/soft/line/util/pagehelper/PageBeans.java b/src/main/java/com/soft/line/util/pagehelper/PageBeans.java new file mode 100644 index 0000000..4f4b510 --- /dev/null +++ b/src/main/java/com/soft/line/util/pagehelper/PageBeans.java @@ -0,0 +1,81 @@ +package com.soft.line.util.pagehelper; + +import com.github.pagehelper.Page; + +import java.io.Serializable; +import java.util.List; + +public class PageBeans implements Serializable { + private static final long serialVersionUID = 6545455108462881123L; + private long total; //总记录数 + private List list; //结果集 + private int pageNum; // 第几页 + private int pageSize; // 每页记录数 + private int pages; // 总页数 + private int size; // 当前页的数量 <= pageSize，该属性来自ArrayList的size属性 + + /** + * 包装Page对象，因为直接返回Page对象. + * @param list page结果 + */ + public PageBeans(List list) { + if (list instanceof Page) { + Page page = (Page) list; + this.pageNum = page.getPageNum(); + this.pageSize = page.getPageSize(); + this.total = page.getTotal(); + this.pages = page.getPages(); + this.list = page; + this.size = page.size(); + } + } + + public long getTotal() { + return total; + } + + public void setTotal(long total) { + this.total = total; + } + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + + public int getPageNum() { + return pageNum; + } + + public void setPageNum(int pageNum) { + this.pageNum = pageNum; + } + + public int getPageSize() { + return pageSize; + } + + public void setPageSize(int pageSize) { + this.pageSize = pageSize; + } + + public int getPages() { + return pages; + } + + public void setPages(int pages) { + this.pages = pages; + } + + public int getSize() { + return size; + } + + public void setSize(int size) { + this.size = size; + } + +} diff --git a/src/main/java/com/soft/line/util/pagehelper/PageUtil.java b/src/main/java/com/soft/line/util/pagehelper/PageUtil.java new file mode 100644 index 0000000..de4a3da --- /dev/null +++ b/src/main/java/com/soft/line/util/pagehelper/PageUtil.java @@ -0,0 +1,43 @@ +package com.soft.line.util.pagehelper; + +import com.github.pagehelper.Page; +import com.github.pagehelper.PageHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.Map; + + +public class PageUtil { + private static final transient Logger LOG = LoggerFactory.getLogger(PageUtil.class); + /** + * set page. + * + * @param paramMap + * + * @return page info. + */ + public static Page> setPageParam(final Map paramMap) { + int pageNum = 1; + int pageSize = 10; + final Object pageNumO = paramMap.get("pageNum"); + final Object pageSizeO = paramMap.get("pageSize"); + if (null != pageNumO) { + pageNum = Integer.parseInt(pageNumO.toString()); + } + + if (null != pageSizeO) { + pageSize = Integer.parseInt(pageSizeO.toString()); + } + + if (paramMap.containsKey("pageNum")) { + pageNum = Integer.parseInt(paramMap.get("pageNum").toString()); + } + + if (paramMap.containsKey("pageSize")) { + pageSize = Integer.parseInt(paramMap.get("pageSize").toString()); + } + final Page> page = PageHelper.startPage(pageNum, pageSize); + return page; + } +} -- Gitee From 863e90ab9895d53bfcd2abdde01e5ab997f64b89 Mon Sep 17 00:00:00 2001 From: ljc <1119265069@qq.com> Date: Wed, 13 May 2020 00:57:50 +0800 Subject: [PATCH 014/211] =?UTF-8?q?=E9=85=8D=E7=BD=AEswagger?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/soft/line/config/SwaggerConfig.java | 47 ------------------- .../com/soft/line/entity/CertificateInfo.java | 5 +- .../line/mapper/CertificateInfoMapper.java | 6 --- .../line/mapper/CertificateInfoMapper.xml | 40 ++++++++-------- .../line/util/generator/mybatis-generator.xml | 22 +++++++-- 5 files changed, 39 insertions(+), 81 deletions(-) delete mode 100644 src/main/java/com/soft/line/config/SwaggerConfig.java diff --git a/src/main/java/com/soft/line/config/SwaggerConfig.java b/src/main/java/com/soft/line/config/SwaggerConfig.java deleted file mode 100644 index 19b3b95..0000000 --- a/src/main/java/com/soft/line/config/SwaggerConfig.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.soft.line.config; - -import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import springfox.documentation.builders.ApiInfoBuilder; -import springfox.documentation.builders.PathSelectors; -import springfox.documentation.builders.RequestHandlerSelectors; -import springfox.documentation.service.ApiInfo; -import springfox.documentation.service.Contact; -import springfox.documentation.spi.DocumentationType; -import springfox.documentation.spring.web.plugins.Docket; -import springfox.documentation.swagger2.annotations.EnableSwagger2; - -/** - * Swagger配置 - */ -@EnableSwagger2 -@Configuration -public class SwaggerConfig { - /** - * 是否开启swagger，正式环境一般是需要关闭的，可根据springboot的多环境配置进行设置 - */ - @Value(value = "${swagger.enabled}") - Boolean swaggerEnabled; - - @Bean - public Docket createRestApi() { - return new Docket(DocumentationType.SWAGGER_2).apiInfo(apiInfo()) - // 是否开启 - .enable(swaggerEnabled).select() - // 扫描的路径包 - .apis(RequestHandlerSelectors.basePackage("com.soft.line")) - // 指定路径处理PathSelectors.any()代表所有的路径 - .paths(PathSelectors.any()).build().pathMapping("/"); - } - - private ApiInfo apiInfo() { - return new ApiInfoBuilder() - .title("shiro") - .description("ITAEM | LJC团队") - // 作者信息 - .contact(new Contact("ljc", "https://www.softline.sh.cn", "ljc@softline.sh.cn")) - .version("1.0.0") - .build(); - } -} \ No newline at end of file diff --git a/src/main/java/com/soft/line/entity/CertificateInfo.java b/src/main/java/com/soft/line/entity/CertificateInfo.java index 24ecf5e..17c2d2c 100644 --- a/src/main/java/com/soft/line/entity/CertificateInfo.java +++ b/src/main/java/com/soft/line/entity/CertificateInfo.java @@ -1,11 +1,8 @@ package com.soft.line.entity; -import java.io.Serializable; import java.util.Date; - -public class CertificateInfo implements Serializable{ - private static final long serialVersionUID = 688776107177440102L; +public class CertificateInfo { /** * This field was generated by MyBatis Generator. * This field corresponds to the database column certificate_info.id diff --git a/src/main/java/com/soft/line/mapper/CertificateInfoMapper.java b/src/main/java/com/soft/line/mapper/CertificateInfoMapper.java index f04a340..54102b5 100644 --- a/src/main/java/com/soft/line/mapper/CertificateInfoMapper.java +++ b/src/main/java/com/soft/line/mapper/CertificateInfoMapper.java @@ -1,11 +1,8 @@ package com.soft.line.mapper; import com.soft.line.entity.CertificateInfo; -import org.apache.ibatis.annotations.Mapper; - import java.util.List; -@Mapper public interface CertificateInfoMapper { /** * This method was generated by MyBatis Generator. @@ -30,7 +27,4 @@ public interface CertificateInfoMapper { * @mbggenerated */ List selectAll(); - - - List getPersonalAll(String userName); } \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/CertificateInfoMapper.xml b/src/main/java/com/soft/line/mapper/CertificateInfoMapper.xml index 3b0cd30..a901091 100644 --- a/src/main/java/com/soft/line/mapper/CertificateInfoMapper.xml +++ b/src/main/java/com/soft/line/mapper/CertificateInfoMapper.xml @@ -1,24 +1,24 @@ - - - - + + + + - - - - - - - - - - - + + + + + + + + + + + - + - + @@ -31,20 +31,20 @@ + targetProject="E:\MyGit\softline-files-manage\src\main\java"> + targetProject="E:\MyGit\softline-files-manage\src\main\java"> @@ -91,5 +91,19 @@ delimitAllColumns="true"> + + +
\ No newline at end of file -- Gitee From ec5fc5c2df3d613cd63476d766d1558a588896ed Mon Sep 17 00:00:00 2001 From: ljc <1119265069@qq.com> Date: Wed, 13 May 2020 20:18:20 +0800 Subject: [PATCH 015/211] =?UTF-8?q?=E9=85=8D=E7=BD=AEentity?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/.gitignore | 8 + .idea/compiler.xml | 22 + .idea/encodings.xml | 6 + .idea/jarRepositories.xml | 30 + ...__ch_qos_logback_logback_classic_1_2_3.xml | 13 + ...ven__ch_qos_logback_logback_core_1_2_3.xml | 13 + .../Maven__com_alibaba_druid_1_1_10.xml | 13 + .../Maven__com_fasterxml_classmate_1_5_1.xml | 13 + ...ackson_core_jackson_annotations_2_10_4.xml | 13 + ...erxml_jackson_core_jackson_core_2_10_4.xml | 13 + ...l_jackson_core_jackson_databind_2_10_4.xml | 13 + ..._datatype_jackson_datatype_jdk8_2_10_4.xml | 13 + ...atatype_jackson_datatype_jsr310_2_10_4.xml | 13 + ..._jackson_module_parameter_names_2_10_4.xml | 13 + .../Maven__com_google_guava_guava_18_0.xml | 13 + ...n__com_jayway_jsonpath_json_path_2_4_0.xml | 13 + ...ogle_android_json_0_0_20131108_vaadin1.xml | 13 + .../Maven__com_zaxxer_HikariCP_3_4_3.xml | 13 + ...mons_beanutils_commons_beanutils_1_9_4.xml | 13 + ..._collections_commons_collections_3_2_2.xml | 13 + ...mons_fileupload_commons_fileupload_1_4.xml | 13 + .../Maven__commons_io_commons_io_2_6.xml | 13 + ...n__commons_logging_commons_logging_1_2.xml | 13 + ...ven__io_springfox_springfox_core_2_5_0.xml | 13 + ...n__io_springfox_springfox_schema_2_5_0.xml | 13 + ...aven__io_springfox_springfox_spi_2_5_0.xml | 13 + ...o_springfox_springfox_spring_web_2_5_0.xml | 13 + ..._io_springfox_springfox_swagger2_2_5_0.xml | 13 + ...ringfox_springfox_swagger_common_2_5_0.xml | 13 + ...o_springfox_springfox_swagger_ui_2_5_0.xml | 13 + ...__io_swagger_swagger_annotations_1_5_9.xml | 13 + ...Maven__io_swagger_swagger_models_1_5_9.xml | 13 + ...ctivation_jakarta_activation_api_1_2_2.xml | 13 + ...nnotation_jakarta_annotation_api_1_3_5.xml | 13 + ...alidation_jakarta_validation_api_2_0_2.xml | 13 + ...ta_xml_bind_jakarta_xml_bind_api_2_3_3.xml | 13 + .idea/libraries/Maven__log4j_log4j_1_2_17.xml | 13 + ...ven__mysql_mysql_connector_java_5_1_40.xml | 13 + ...aven__net_bytebuddy_byte_buddy_1_10_10.xml | 13 + ...net_bytebuddy_byte_buddy_agent_1_10_10.xml | 13 + ...Maven__net_minidev_accessors_smart_1_2.xml | 13 + .../Maven__net_minidev_json_smart_2_3.xml | 13 + ...pache_commons_commons_collections4_4_4.xml | 13 + ...__org_apache_commons_commons_lang3_3_9.xml | 13 + ...org_apache_commons_commons_pool2_2_7_0.xml | 13 + ...n__org_apache_commons_commons_text_1_8.xml | 13 + ..._apache_logging_log4j_log4j_api_2_12_1.xml | 13 + ...he_logging_log4j_log4j_to_slf4j_2_12_1.xml | 13 + ..._tomcat_embed_tomcat_embed_core_9_0_34.xml | 13 + ...he_tomcat_embed_tomcat_embed_el_9_0_34.xml | 13 + ...at_embed_tomcat_embed_websocket_9_0_34.xml | 13 + ..._org_apiguardian_apiguardian_api_1_1_0.xml | 13 + ...Maven__org_aspectj_aspectjweaver_1_9_5.xml | 13 + ...Maven__org_assertj_assertj_core_3_13_2.xml | 13 + .../Maven__org_hamcrest_hamcrest_2_1.xml | 13 + ...dator_hibernate_validator_6_0_19_Final.xml | 13 + ...boss_logging_jboss_logging_3_4_1_Final.xml | 13 + ..._org_junit_jupiter_junit_jupiter_5_5_2.xml | 13 + ..._junit_jupiter_junit_jupiter_api_5_5_2.xml | 13 + ...nit_jupiter_junit_jupiter_engine_5_5_2.xml | 13 + ...nit_jupiter_junit_jupiter_params_5_5_2.xml | 13 + ..._platform_junit_platform_commons_1_5_2.xml | 13 + ...t_platform_junit_platform_engine_1_5_2.xml | 13 + ...n__org_mapstruct_mapstruct_1_0_0_Final.xml | 13 + .../Maven__org_mockito_mockito_core_3_1_0.xml | 13 + ...rg_mockito_mockito_junit_jupiter_3_1_0.xml | 13 + .../Maven__org_mybatis_mybatis_3_5_4.xml | 13 + ...aven__org_mybatis_mybatis_spring_2_0_4.xml | 13 + ...ybatis_spring_boot_autoconfigure_2_1_2.xml | 13 + ...boot_mybatis_spring_boot_starter_2_1_2.xml | 13 + .../Maven__org_objenesis_objenesis_2_6.xml | 13 + ...Maven__org_opentest4j_opentest4j_1_2_0.xml | 13 + .../Maven__org_ow2_asm_asm_5_0_4.xml | 13 + ...aven__org_projectlombok_lombok_1_18_12.xml | 13 + ...aven__org_skyscreamer_jsonassert_1_5_0.xml | 13 + .../Maven__org_slf4j_jul_to_slf4j_1_7_30.xml | 13 + .../Maven__org_slf4j_slf4j_api_1_7_30.xml | 13 + ...amework_boot_spring_boot_2_2_7_RELEASE.xml | 13 + ...pring_boot_autoconfigure_2_2_7_RELEASE.xml | 13 + ...oot_spring_boot_devtools_2_2_7_RELEASE.xml | 13 + ...boot_spring_boot_starter_2_2_7_RELEASE.xml | 13 + ..._spring_boot_starter_aop_2_2_7_RELEASE.xml | 13 + ...spring_boot_starter_jdbc_2_2_7_RELEASE.xml | 13 + ...spring_boot_starter_json_2_2_7_RELEASE.xml | 13 + ...ing_boot_starter_logging_2_2_7_RELEASE.xml | 13 + ...spring_boot_starter_test_2_2_7_RELEASE.xml | 13 + ...ring_boot_starter_tomcat_2_2_7_RELEASE.xml | 13 + ..._boot_starter_validation_2_2_7_RELEASE.xml | 13 + ..._spring_boot_starter_web_2_2_7_RELEASE.xml | 13 + ...rk_boot_spring_boot_test_2_2_7_RELEASE.xml | 13 + ..._boot_test_autoconfigure_2_2_7_RELEASE.xml | 13 + ...lugin_spring_plugin_core_1_2_0_RELEASE.xml | 13 + ...n_spring_plugin_metadata_1_2_0_RELEASE.xml | 13 + ...ringframework_spring_aop_5_2_6_RELEASE.xml | 13 + ...ngframework_spring_beans_5_2_6_RELEASE.xml | 13 + ...framework_spring_context_5_2_6_RELEASE.xml | 13 + ...ingframework_spring_core_5_2_6_RELEASE.xml | 13 + ...mework_spring_expression_5_2_6_RELEASE.xml | 13 + ...ringframework_spring_jcl_5_2_6_RELEASE.xml | 13 + ...ingframework_spring_jdbc_5_2_6_RELEASE.xml | 13 + ...ingframework_spring_test_5_2_6_RELEASE.xml | 13 + ...pringframework_spring_tx_5_2_6_RELEASE.xml | 13 + ...ringframework_spring_web_5_2_6_RELEASE.xml | 13 + ...gframework_spring_webmvc_5_2_6_RELEASE.xml | 13 + .../Maven__org_xmlunit_xmlunit_core_2_6_4.xml | 13 + .../Maven__org_yaml_snakeyaml_1_25.xml | 13 + .idea/misc.xml | 11 + .idea/modules.xml | 8 + .idea/vcs.xml | 6 + pom.xml | 10 +- softline-files-manage.iml | 10 +- .../com/soft/line/entity/ContractInfo.java | 518 ++++++++++++++++++ .../soft/line/mapper/ContractInfoMapper.java | 30 + .../soft/line/mapper/ContractInfoMapper.xml | 65 +++ 114 files changed, 2044 insertions(+), 6 deletions(-) create mode 100644 .idea/.gitignore create mode 100644 .idea/compiler.xml create mode 100644 .idea/encodings.xml create mode 100644 .idea/jarRepositories.xml create mode 100644 .idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_3.xml create mode 100644 .idea/libraries/Maven__ch_qos_logback_logback_core_1_2_3.xml create mode 100644 .idea/libraries/Maven__com_alibaba_druid_1_1_10.xml create mode 100644 .idea/libraries/Maven__com_fasterxml_classmate_1_5_1.xml create mode 100644 .idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_10_4.xml create mode 100644 .idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_10_4.xml create mode 100644 .idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_10_4.xml create mode 100644 .idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_10_4.xml create mode 100644 .idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_10_4.xml create mode 100644 .idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_10_4.xml create mode 100644 .idea/libraries/Maven__com_google_guava_guava_18_0.xml create mode 100644 .idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml create mode 100644 .idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml create mode 100644 .idea/libraries/Maven__com_zaxxer_HikariCP_3_4_3.xml create mode 100644 .idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_4.xml create mode 100644 .idea/libraries/Maven__commons_collections_commons_collections_3_2_2.xml create mode 100644 .idea/libraries/Maven__commons_fileupload_commons_fileupload_1_4.xml create mode 100644 .idea/libraries/Maven__commons_io_commons_io_2_6.xml create mode 100644 .idea/libraries/Maven__commons_logging_commons_logging_1_2.xml create mode 100644 .idea/libraries/Maven__io_springfox_springfox_core_2_5_0.xml create mode 100644 .idea/libraries/Maven__io_springfox_springfox_schema_2_5_0.xml create mode 100644 .idea/libraries/Maven__io_springfox_springfox_spi_2_5_0.xml create mode 100644 .idea/libraries/Maven__io_springfox_springfox_spring_web_2_5_0.xml create mode 100644 .idea/libraries/Maven__io_springfox_springfox_swagger2_2_5_0.xml create mode 100644 .idea/libraries/Maven__io_springfox_springfox_swagger_common_2_5_0.xml create mode 100644 .idea/libraries/Maven__io_springfox_springfox_swagger_ui_2_5_0.xml create mode 100644 .idea/libraries/Maven__io_swagger_swagger_annotations_1_5_9.xml create mode 100644 .idea/libraries/Maven__io_swagger_swagger_models_1_5_9.xml create mode 100644 .idea/libraries/Maven__jakarta_activation_jakarta_activation_api_1_2_2.xml create mode 100644 .idea/libraries/Maven__jakarta_annotation_jakarta_annotation_api_1_3_5.xml create mode 100644 .idea/libraries/Maven__jakarta_validation_jakarta_validation_api_2_0_2.xml create mode 100644 .idea/libraries/Maven__jakarta_xml_bind_jakarta_xml_bind_api_2_3_3.xml create mode 100644 .idea/libraries/Maven__log4j_log4j_1_2_17.xml create mode 100644 .idea/libraries/Maven__mysql_mysql_connector_java_5_1_40.xml create mode 100644 .idea/libraries/Maven__net_bytebuddy_byte_buddy_1_10_10.xml create mode 100644 .idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_10_10.xml create mode 100644 .idea/libraries/Maven__net_minidev_accessors_smart_1_2.xml create mode 100644 .idea/libraries/Maven__net_minidev_json_smart_2_3.xml create mode 100644 .idea/libraries/Maven__org_apache_commons_commons_collections4_4_4.xml create mode 100644 .idea/libraries/Maven__org_apache_commons_commons_lang3_3_9.xml create mode 100644 .idea/libraries/Maven__org_apache_commons_commons_pool2_2_7_0.xml create mode 100644 .idea/libraries/Maven__org_apache_commons_commons_text_1_8.xml create mode 100644 .idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_12_1.xml create mode 100644 .idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_12_1.xml create mode 100644 .idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_34.xml create mode 100644 .idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_9_0_34.xml create mode 100644 .idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_34.xml create mode 100644 .idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_0.xml create mode 100644 .idea/libraries/Maven__org_aspectj_aspectjweaver_1_9_5.xml create mode 100644 .idea/libraries/Maven__org_assertj_assertj_core_3_13_2.xml create mode 100644 .idea/libraries/Maven__org_hamcrest_hamcrest_2_1.xml create mode 100644 .idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_0_19_Final.xml create mode 100644 .idea/libraries/Maven__org_jboss_logging_jboss_logging_3_4_1_Final.xml create mode 100644 .idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_5_2.xml create mode 100644 .idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_5_2.xml create mode 100644 .idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_5_2.xml create mode 100644 .idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_5_2.xml create mode 100644 .idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_5_2.xml create mode 100644 .idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_5_2.xml create mode 100644 .idea/libraries/Maven__org_mapstruct_mapstruct_1_0_0_Final.xml create mode 100644 .idea/libraries/Maven__org_mockito_mockito_core_3_1_0.xml create mode 100644 .idea/libraries/Maven__org_mockito_mockito_junit_jupiter_3_1_0.xml create mode 100644 .idea/libraries/Maven__org_mybatis_mybatis_3_5_4.xml create mode 100644 .idea/libraries/Maven__org_mybatis_mybatis_spring_2_0_4.xml create mode 100644 .idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_2_1_2.xml create mode 100644 .idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_2_1_2.xml create mode 100644 .idea/libraries/Maven__org_objenesis_objenesis_2_6.xml create mode 100644 .idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml create mode 100644 .idea/libraries/Maven__org_ow2_asm_asm_5_0_4.xml create mode 100644 .idea/libraries/Maven__org_projectlombok_lombok_1_18_12.xml create mode 100644 .idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml create mode 100644 .idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_30.xml create mode 100644 .idea/libraries/Maven__org_slf4j_slf4j_api_1_7_30.xml create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_2_2_7_RELEASE.xml create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_2_7_RELEASE.xml create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_devtools_2_2_7_RELEASE.xml create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_2_7_RELEASE.xml create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_2_7_RELEASE.xml create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_2_7_RELEASE.xml create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_2_7_RELEASE.xml create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_2_7_RELEASE.xml create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_2_7_RELEASE.xml create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_2_7_RELEASE.xml create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_validation_2_2_7_RELEASE.xml create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_2_7_RELEASE.xml create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_2_7_RELEASE.xml create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_2_7_RELEASE.xml create mode 100644 .idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_1_2_0_RELEASE.xml create mode 100644 .idea/libraries/Maven__org_springframework_plugin_spring_plugin_metadata_1_2_0_RELEASE.xml create mode 100644 .idea/libraries/Maven__org_springframework_spring_aop_5_2_6_RELEASE.xml create mode 100644 .idea/libraries/Maven__org_springframework_spring_beans_5_2_6_RELEASE.xml create mode 100644 .idea/libraries/Maven__org_springframework_spring_context_5_2_6_RELEASE.xml create mode 100644 .idea/libraries/Maven__org_springframework_spring_core_5_2_6_RELEASE.xml create mode 100644 .idea/libraries/Maven__org_springframework_spring_expression_5_2_6_RELEASE.xml create mode 100644 .idea/libraries/Maven__org_springframework_spring_jcl_5_2_6_RELEASE.xml create mode 100644 .idea/libraries/Maven__org_springframework_spring_jdbc_5_2_6_RELEASE.xml create mode 100644 .idea/libraries/Maven__org_springframework_spring_test_5_2_6_RELEASE.xml create mode 100644 .idea/libraries/Maven__org_springframework_spring_tx_5_2_6_RELEASE.xml create mode 100644 .idea/libraries/Maven__org_springframework_spring_web_5_2_6_RELEASE.xml create mode 100644 .idea/libraries/Maven__org_springframework_spring_webmvc_5_2_6_RELEASE.xml create mode 100644 .idea/libraries/Maven__org_xmlunit_xmlunit_core_2_6_4.xml create mode 100644 .idea/libraries/Maven__org_yaml_snakeyaml_1_25.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/vcs.xml create mode 100644 src/main/java/com/soft/line/entity/ContractInfo.java create mode 100644 src/main/java/com/soft/line/mapper/ContractInfoMapper.java create mode 100644 src/main/java/com/soft/line/mapper/ContractInfoMapper.xml diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..73f69e0 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,8 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml +# Editor-based HTTP Client requests +/httpRequests/ diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..f3de3d2 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..63e9001 --- /dev/null +++ b/.idea/encodings.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..15a50bb --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_3.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_3.xml new file mode 100644 index 0000000..7493b57 --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_3.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_3.xml new file mode 100644 index 0000000..a403ead --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_alibaba_druid_1_1_10.xml b/.idea/libraries/Maven__com_alibaba_druid_1_1_10.xml new file mode 100644 index 0000000..d3211e5 --- /dev/null +++ b/.idea/libraries/Maven__com_alibaba_druid_1_1_10.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_5_1.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_5_1.xml new file mode 100644 index 0000000..21396e2 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_5_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_10_4.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_10_4.xml new file mode 100644 index 0000000..15e0f3e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_10_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_10_4.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_10_4.xml new file mode 100644 index 0000000..440178e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_10_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_10_4.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_10_4.xml new file mode 100644 index 0000000..703b49c --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_10_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_10_4.xml b/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_10_4.xml new file mode 100644 index 0000000..4a10908 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_10_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_10_4.xml b/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_10_4.xml new file mode 100644 index 0000000..ccd1b43 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_10_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_10_4.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_10_4.xml new file mode 100644 index 0000000..0f0db27 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_10_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_guava_guava_18_0.xml b/.idea/libraries/Maven__com_google_guava_guava_18_0.xml new file mode 100644 index 0000000..05310e2 --- /dev/null +++ b/.idea/libraries/Maven__com_google_guava_guava_18_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml b/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml new file mode 100644 index 0000000..e1f705f --- /dev/null +++ b/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml b/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml new file mode 100644 index 0000000..f45360a --- /dev/null +++ b/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_zaxxer_HikariCP_3_4_3.xml b/.idea/libraries/Maven__com_zaxxer_HikariCP_3_4_3.xml new file mode 100644 index 0000000..eebd8bb --- /dev/null +++ b/.idea/libraries/Maven__com_zaxxer_HikariCP_3_4_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_4.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_4.xml new file mode 100644 index 0000000..89f2484 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_2.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_2.xml new file mode 100644 index 0000000..03a1d6d --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_4.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_4.xml new file mode 100644 index 0000000..e260d92 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_6.xml b/.idea/libraries/Maven__commons_io_commons_io_2_6.xml new file mode 100644 index 0000000..4d81426 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml b/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml new file mode 100644 index 0000000..5d533a7 --- /dev/null +++ b/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_springfox_springfox_core_2_5_0.xml b/.idea/libraries/Maven__io_springfox_springfox_core_2_5_0.xml new file mode 100644 index 0000000..e5f84a6 --- /dev/null +++ b/.idea/libraries/Maven__io_springfox_springfox_core_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_springfox_springfox_schema_2_5_0.xml b/.idea/libraries/Maven__io_springfox_springfox_schema_2_5_0.xml new file mode 100644 index 0000000..6e400bc --- /dev/null +++ b/.idea/libraries/Maven__io_springfox_springfox_schema_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_springfox_springfox_spi_2_5_0.xml b/.idea/libraries/Maven__io_springfox_springfox_spi_2_5_0.xml new file mode 100644 index 0000000..d03f166 --- /dev/null +++ b/.idea/libraries/Maven__io_springfox_springfox_spi_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_springfox_springfox_spring_web_2_5_0.xml b/.idea/libraries/Maven__io_springfox_springfox_spring_web_2_5_0.xml new file mode 100644 index 0000000..676e480 --- /dev/null +++ b/.idea/libraries/Maven__io_springfox_springfox_spring_web_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_springfox_springfox_swagger2_2_5_0.xml b/.idea/libraries/Maven__io_springfox_springfox_swagger2_2_5_0.xml new file mode 100644 index 0000000..509eff4 --- /dev/null +++ b/.idea/libraries/Maven__io_springfox_springfox_swagger2_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_springfox_springfox_swagger_common_2_5_0.xml b/.idea/libraries/Maven__io_springfox_springfox_swagger_common_2_5_0.xml new file mode 100644 index 0000000..c60ba87 --- /dev/null +++ b/.idea/libraries/Maven__io_springfox_springfox_swagger_common_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_springfox_springfox_swagger_ui_2_5_0.xml b/.idea/libraries/Maven__io_springfox_springfox_swagger_ui_2_5_0.xml new file mode 100644 index 0000000..a0930b1 --- /dev/null +++ b/.idea/libraries/Maven__io_springfox_springfox_swagger_ui_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_swagger_swagger_annotations_1_5_9.xml b/.idea/libraries/Maven__io_swagger_swagger_annotations_1_5_9.xml new file mode 100644 index 0000000..0506740 --- /dev/null +++ b/.idea/libraries/Maven__io_swagger_swagger_annotations_1_5_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_swagger_swagger_models_1_5_9.xml b/.idea/libraries/Maven__io_swagger_swagger_models_1_5_9.xml new file mode 100644 index 0000000..1140464 --- /dev/null +++ b/.idea/libraries/Maven__io_swagger_swagger_models_1_5_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__jakarta_activation_jakarta_activation_api_1_2_2.xml b/.idea/libraries/Maven__jakarta_activation_jakarta_activation_api_1_2_2.xml new file mode 100644 index 0000000..fdbcdd0 --- /dev/null +++ b/.idea/libraries/Maven__jakarta_activation_jakarta_activation_api_1_2_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__jakarta_annotation_jakarta_annotation_api_1_3_5.xml b/.idea/libraries/Maven__jakarta_annotation_jakarta_annotation_api_1_3_5.xml new file mode 100644 index 0000000..986950b --- /dev/null +++ b/.idea/libraries/Maven__jakarta_annotation_jakarta_annotation_api_1_3_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__jakarta_validation_jakarta_validation_api_2_0_2.xml b/.idea/libraries/Maven__jakarta_validation_jakarta_validation_api_2_0_2.xml new file mode 100644 index 0000000..b479729 --- /dev/null +++ b/.idea/libraries/Maven__jakarta_validation_jakarta_validation_api_2_0_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__jakarta_xml_bind_jakarta_xml_bind_api_2_3_3.xml b/.idea/libraries/Maven__jakarta_xml_bind_jakarta_xml_bind_api_2_3_3.xml new file mode 100644 index 0000000..7fe9955 --- /dev/null +++ b/.idea/libraries/Maven__jakarta_xml_bind_jakarta_xml_bind_api_2_3_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__log4j_log4j_1_2_17.xml b/.idea/libraries/Maven__log4j_log4j_1_2_17.xml new file mode 100644 index 0000000..9ff36fe --- /dev/null +++ b/.idea/libraries/Maven__log4j_log4j_1_2_17.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_40.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_40.xml new file mode 100644 index 0000000..338a2a6 --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_40.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_10_10.xml b/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_10_10.xml new file mode 100644 index 0000000..d7c7161 --- /dev/null +++ b/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_10_10.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_10_10.xml b/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_10_10.xml new file mode 100644 index 0000000..025fe02 --- /dev/null +++ b/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_10_10.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_minidev_accessors_smart_1_2.xml b/.idea/libraries/Maven__net_minidev_accessors_smart_1_2.xml new file mode 100644 index 0000000..e9bd55e --- /dev/null +++ b/.idea/libraries/Maven__net_minidev_accessors_smart_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_minidev_json_smart_2_3.xml b/.idea/libraries/Maven__net_minidev_json_smart_2_3.xml new file mode 100644 index 0000000..7e3ce5c --- /dev/null +++ b/.idea/libraries/Maven__net_minidev_json_smart_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_collections4_4_4.xml b/.idea/libraries/Maven__org_apache_commons_commons_collections4_4_4.xml new file mode 100644 index 0000000..894626e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_collections4_4_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_9.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_9.xml new file mode 100644 index 0000000..0cf74c1 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_pool2_2_7_0.xml b/.idea/libraries/Maven__org_apache_commons_commons_pool2_2_7_0.xml new file mode 100644 index 0000000..8d52584 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_pool2_2_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_text_1_8.xml b/.idea/libraries/Maven__org_apache_commons_commons_text_1_8.xml new file mode 100644 index 0000000..d3898f3 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_text_1_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_12_1.xml b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_12_1.xml new file mode 100644 index 0000000..52fb201 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_12_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_12_1.xml b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_12_1.xml new file mode 100644 index 0000000..f1a0aeb --- /dev/null +++ b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_12_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_34.xml b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_34.xml new file mode 100644 index 0000000..ea63753 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_34.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_9_0_34.xml b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_9_0_34.xml new file mode 100644 index 0000000..19861d6 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_9_0_34.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_34.xml b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_34.xml new file mode 100644 index 0000000..d9ee910 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_34.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_0.xml b/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_0.xml new file mode 100644 index 0000000..9a50009 --- /dev/null +++ b/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_9_5.xml b/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_9_5.xml new file mode 100644 index 0000000..f24ea0e --- /dev/null +++ b/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_9_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_assertj_assertj_core_3_13_2.xml b/.idea/libraries/Maven__org_assertj_assertj_core_3_13_2.xml new file mode 100644 index 0000000..6682843 --- /dev/null +++ b/.idea/libraries/Maven__org_assertj_assertj_core_3_13_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_2_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_2_1.xml new file mode 100644 index 0000000..e2c94de --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_0_19_Final.xml b/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_0_19_Final.xml new file mode 100644 index 0000000..be86c32 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_0_19_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_4_1_Final.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_4_1_Final.xml new file mode 100644 index 0000000..58d3ffb --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_4_1_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_5_2.xml b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_5_2.xml new file mode 100644 index 0000000..edbb0d2 --- /dev/null +++ b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_5_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_5_2.xml b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_5_2.xml new file mode 100644 index 0000000..3c53e35 --- /dev/null +++ b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_5_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_5_2.xml b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_5_2.xml new file mode 100644 index 0000000..bfb6ca5 --- /dev/null +++ b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_5_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_5_2.xml b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_5_2.xml new file mode 100644 index 0000000..1a36de1 --- /dev/null +++ b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_5_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_5_2.xml b/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_5_2.xml new file mode 100644 index 0000000..b4df79e --- /dev/null +++ b/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_5_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_5_2.xml b/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_5_2.xml new file mode 100644 index 0000000..bfce41e --- /dev/null +++ b/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_5_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mapstruct_mapstruct_1_0_0_Final.xml b/.idea/libraries/Maven__org_mapstruct_mapstruct_1_0_0_Final.xml new file mode 100644 index 0000000..c5fe363 --- /dev/null +++ b/.idea/libraries/Maven__org_mapstruct_mapstruct_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_3_1_0.xml b/.idea/libraries/Maven__org_mockito_mockito_core_3_1_0.xml new file mode 100644 index 0000000..8c76780 --- /dev/null +++ b/.idea/libraries/Maven__org_mockito_mockito_core_3_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_junit_jupiter_3_1_0.xml b/.idea/libraries/Maven__org_mockito_mockito_junit_jupiter_3_1_0.xml new file mode 100644 index 0000000..1991a90 --- /dev/null +++ b/.idea/libraries/Maven__org_mockito_mockito_junit_jupiter_3_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mybatis_mybatis_3_5_4.xml b/.idea/libraries/Maven__org_mybatis_mybatis_3_5_4.xml new file mode 100644 index 0000000..c58796d --- /dev/null +++ b/.idea/libraries/Maven__org_mybatis_mybatis_3_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mybatis_mybatis_spring_2_0_4.xml b/.idea/libraries/Maven__org_mybatis_mybatis_spring_2_0_4.xml new file mode 100644 index 0000000..66f5630 --- /dev/null +++ b/.idea/libraries/Maven__org_mybatis_mybatis_spring_2_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_2_1_2.xml b/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_2_1_2.xml new file mode 100644 index 0000000..9316310 --- /dev/null +++ b/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_2_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_2_1_2.xml b/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_2_1_2.xml new file mode 100644 index 0000000..f6ddd21 --- /dev/null +++ b/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_2_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_2_6.xml b/.idea/libraries/Maven__org_objenesis_objenesis_2_6.xml new file mode 100644 index 0000000..9ca25ef --- /dev/null +++ b/.idea/libraries/Maven__org_objenesis_objenesis_2_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml b/.idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml new file mode 100644 index 0000000..9ec0242 --- /dev/null +++ b/.idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_ow2_asm_asm_5_0_4.xml b/.idea/libraries/Maven__org_ow2_asm_asm_5_0_4.xml new file mode 100644 index 0000000..eb3638f --- /dev/null +++ b/.idea/libraries/Maven__org_ow2_asm_asm_5_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_projectlombok_lombok_1_18_12.xml b/.idea/libraries/Maven__org_projectlombok_lombok_1_18_12.xml new file mode 100644 index 0000000..473e68f --- /dev/null +++ b/.idea/libraries/Maven__org_projectlombok_lombok_1_18_12.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml b/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml new file mode 100644 index 0000000..7cb3a6e --- /dev/null +++ b/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_30.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_30.xml new file mode 100644 index 0000000..2a8d7bf --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_30.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_30.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_30.xml new file mode 100644 index 0000000..6977f51 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_30.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_2_7_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_2_7_RELEASE.xml new file mode 100644 index 0000000..afcb7fd --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_2_7_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_2_7_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_2_7_RELEASE.xml new file mode 100644 index 0000000..5a95ea0 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_2_7_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_devtools_2_2_7_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_devtools_2_2_7_RELEASE.xml new file mode 100644 index 0000000..af97c66 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_devtools_2_2_7_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_2_7_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_2_7_RELEASE.xml new file mode 100644 index 0000000..0233b5e --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_2_7_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_2_7_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_2_7_RELEASE.xml new file mode 100644 index 0000000..4d3f83e --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_2_7_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_2_7_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_2_7_RELEASE.xml new file mode 100644 index 0000000..8d8a862 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_2_7_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_2_7_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_2_7_RELEASE.xml new file mode 100644 index 0000000..e55a166 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_2_7_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_2_7_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_2_7_RELEASE.xml new file mode 100644 index 0000000..d4677d8 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_2_7_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_2_7_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_2_7_RELEASE.xml new file mode 100644 index 0000000..fef1921 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_2_7_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_2_7_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_2_7_RELEASE.xml new file mode 100644 index 0000000..2c1c30c --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_2_7_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_validation_2_2_7_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_validation_2_2_7_RELEASE.xml new file mode 100644 index 0000000..3e73a27 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_validation_2_2_7_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_2_7_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_2_7_RELEASE.xml new file mode 100644 index 0000000..9245344 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_2_7_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_2_7_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_2_7_RELEASE.xml new file mode 100644 index 0000000..fe9b58e --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_2_7_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_2_7_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_2_7_RELEASE.xml new file mode 100644 index 0000000..71586ff --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_2_7_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_1_2_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_1_2_0_RELEASE.xml new file mode 100644 index 0000000..adec55c --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_1_2_0_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_metadata_1_2_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_metadata_1_2_0_RELEASE.xml new file mode 100644 index 0000000..ba07f04 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_metadata_1_2_0_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_5_2_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_5_2_6_RELEASE.xml new file mode 100644 index 0000000..9b83e3b --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_aop_5_2_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_5_2_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_5_2_6_RELEASE.xml new file mode 100644 index 0000000..266aae6 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_beans_5_2_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_5_2_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_5_2_6_RELEASE.xml new file mode 100644 index 0000000..0a298bc --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_5_2_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_core_5_2_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_core_5_2_6_RELEASE.xml new file mode 100644 index 0000000..26cd03a --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_core_5_2_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_5_2_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_expression_5_2_6_RELEASE.xml new file mode 100644 index 0000000..f93c5ed --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_expression_5_2_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jcl_5_2_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jcl_5_2_6_RELEASE.xml new file mode 100644 index 0000000..273251f --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_jcl_5_2_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_5_2_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_5_2_6_RELEASE.xml new file mode 100644 index 0000000..a5f7127 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_jdbc_5_2_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_test_5_2_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_test_5_2_6_RELEASE.xml new file mode 100644 index 0000000..e419d05 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_test_5_2_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_5_2_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_tx_5_2_6_RELEASE.xml new file mode 100644 index 0000000..14ea38a --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_tx_5_2_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_web_5_2_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_web_5_2_6_RELEASE.xml new file mode 100644 index 0000000..294accf --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_web_5_2_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_webmvc_5_2_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_webmvc_5_2_6_RELEASE.xml new file mode 100644 index 0000000..3e5388c --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_webmvc_5_2_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_6_4.xml b/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_6_4.xml new file mode 100644 index 0000000..8011e75 --- /dev/null +++ b/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_6_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_yaml_snakeyaml_1_25.xml b/.idea/libraries/Maven__org_yaml_snakeyaml_1_25.xml new file mode 100644 index 0000000..e75d127 --- /dev/null +++ b/.idea/libraries/Maven__org_yaml_snakeyaml_1_25.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..4361200 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,11 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..42a633f --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index bf0da3d..b9ebf52 100644 --- a/pom.xml +++ b/pom.xml @@ -89,6 +89,8 @@ commons-text ${apache.commons-text.version} + + org.projectlombok lombok @@ -170,15 +172,17 @@ - + + src/main/resources + + diff --git a/softline-files-manage.iml b/softline-files-manage.iml index 316ac03..b4fd046 100644 --- a/softline-files-manage.iml +++ b/softline-files-manage.iml @@ -19,11 +19,11 @@ - + - + @@ -60,7 +60,6 @@ - @@ -123,5 +122,10 @@ + + + + + \ No newline at end of file diff --git a/src/main/java/com/soft/line/entity/ContractInfo.java b/src/main/java/com/soft/line/entity/ContractInfo.java new file mode 100644 index 0000000..69c404b --- /dev/null +++ b/src/main/java/com/soft/line/entity/ContractInfo.java @@ -0,0 +1,518 @@ +package com.soft.line.entity; + +import java.math.BigDecimal; +import java.util.Date; + +public class ContractInfo { + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column contract_info.id + * + * @mbggenerated + */ + private Long id; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column contract_info.dep_id + * + * @mbggenerated + */ + private String depId; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column contract_info.contract_name + * + * @mbggenerated + */ + private String contractName; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column contract_info.pro_id + * + * @mbggenerated + */ + private String proId; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column contract_info.total amount + * + * @mbggenerated + */ + private BigDecimal totalAmount; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column contract_info.part_a + * + * @mbggenerated + */ + private String partA; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column contract_info.part_b + * + * @mbggenerated + */ + private String partB; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column contract_info.sign_time + * + * @mbggenerated + */ + private Date signTime; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column contract_info.sign_addr + * + * @mbggenerated + */ + private String signAddr; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column contract_info.begin_date + * + * @mbggenerated + */ + private Date beginDate; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column contract_info.end_date + * + * @mbggenerated + */ + private Date endDate; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column contract_info.payment + * + * @mbggenerated + */ + private String payment; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column contract_info.cont_attachment + * + * @mbggenerated + */ + private String contAttachment; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column contract_info.note + * + * @mbggenerated + */ + private String note; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column contract_info.modify_person + * + * @mbggenerated + */ + private String modifyPerson; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column contract_info.modify_time + * + * @mbggenerated + */ + private Date modifyTime; + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column contract_info.id + * + * @return the value of contract_info.id + * + * @mbggenerated + */ + public Long getId() { + return id; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column contract_info.id + * + * @param id the value for contract_info.id + * + * @mbggenerated + */ + public void setId(Long id) { + this.id = id; + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column contract_info.dep_id + * + * @return the value of contract_info.dep_id + * + * @mbggenerated + */ + public String getDepId() { + return depId; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column contract_info.dep_id + * + * @param depId the value for contract_info.dep_id + * + * @mbggenerated + */ + public void setDepId(String depId) { + this.depId = depId == null ? null : depId.trim(); + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column contract_info.contract_name + * + * @return the value of contract_info.contract_name + * + * @mbggenerated + */ + public String getContractName() { + return contractName; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column contract_info.contract_name + * + * @param contractName the value for contract_info.contract_name + * + * @mbggenerated + */ + public void setContractName(String contractName) { + this.contractName = contractName == null ? null : contractName.trim(); + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column contract_info.pro_id + * + * @return the value of contract_info.pro_id + * + * @mbggenerated + */ + public String getProId() { + return proId; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column contract_info.pro_id + * + * @param proId the value for contract_info.pro_id + * + * @mbggenerated + */ + public void setProId(String proId) { + this.proId = proId == null ? null : proId.trim(); + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column contract_info.total amount + * + * @return the value of contract_info.total amount + * + * @mbggenerated + */ + public BigDecimal getTotalAmount() { + return totalAmount; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column contract_info.total amount + * + * @param totalAmount the value for contract_info.total amount + * + * @mbggenerated + */ + public void setTotalAmount(BigDecimal totalAmount) { + this.totalAmount = totalAmount; + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column contract_info.part_a + * + * @return the value of contract_info.part_a + * + * @mbggenerated + */ + public String getPartA() { + return partA; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column contract_info.part_a + * + * @param partA the value for contract_info.part_a + * + * @mbggenerated + */ + public void setPartA(String partA) { + this.partA = partA == null ? null : partA.trim(); + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column contract_info.part_b + * + * @return the value of contract_info.part_b + * + * @mbggenerated + */ + public String getPartB() { + return partB; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column contract_info.part_b + * + * @param partB the value for contract_info.part_b + * + * @mbggenerated + */ + public void setPartB(String partB) { + this.partB = partB == null ? null : partB.trim(); + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column contract_info.sign_time + * + * @return the value of contract_info.sign_time + * + * @mbggenerated + */ + public Date getSignTime() { + return signTime; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column contract_info.sign_time + * + * @param signTime the value for contract_info.sign_time + * + * @mbggenerated + */ + public void setSignTime(Date signTime) { + this.signTime = signTime; + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column contract_info.sign_addr + * + * @return the value of contract_info.sign_addr + * + * @mbggenerated + */ + public String getSignAddr() { + return signAddr; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column contract_info.sign_addr + * + * @param signAddr the value for contract_info.sign_addr + * + * @mbggenerated + */ + public void setSignAddr(String signAddr) { + this.signAddr = signAddr == null ? null : signAddr.trim(); + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column contract_info.begin_date + * + * @return the value of contract_info.begin_date + * + * @mbggenerated + */ + public Date getBeginDate() { + return beginDate; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column contract_info.begin_date + * + * @param beginDate the value for contract_info.begin_date + * + * @mbggenerated + */ + public void setBeginDate(Date beginDate) { + this.beginDate = beginDate; + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column contract_info.end_date + * + * @return the value of contract_info.end_date + * + * @mbggenerated + */ + public Date getEndDate() { + return endDate; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column contract_info.end_date + * + * @param endDate the value for contract_info.end_date + * + * @mbggenerated + */ + public void setEndDate(Date endDate) { + this.endDate = endDate; + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column contract_info.payment + * + * @return the value of contract_info.payment + * + * @mbggenerated + */ + public String getPayment() { + return payment; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column contract_info.payment + * + * @param payment the value for contract_info.payment + * + * @mbggenerated + */ + public void setPayment(String payment) { + this.payment = payment == null ? null : payment.trim(); + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column contract_info.cont_attachment + * + * @return the value of contract_info.cont_attachment + * + * @mbggenerated + */ + public String getContAttachment() { + return contAttachment; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column contract_info.cont_attachment + * + * @param contAttachment the value for contract_info.cont_attachment + * + * @mbggenerated + */ + public void setContAttachment(String contAttachment) { + this.contAttachment = contAttachment == null ? null : contAttachment.trim(); + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column contract_info.note + * + * @return the value of contract_info.note + * + * @mbggenerated + */ + public String getNote() { + return note; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column contract_info.note + * + * @param note the value for contract_info.note + * + * @mbggenerated + */ + public void setNote(String note) { + this.note = note == null ? null : note.trim(); + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column contract_info.modify_person + * + * @return the value of contract_info.modify_person + * + * @mbggenerated + */ + public String getModifyPerson() { + return modifyPerson; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column contract_info.modify_person + * + * @param modifyPerson the value for contract_info.modify_person + * + * @mbggenerated + */ + public void setModifyPerson(String modifyPerson) { + this.modifyPerson = modifyPerson == null ? null : modifyPerson.trim(); + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column contract_info.modify_time + * + * @return the value of contract_info.modify_time + * + * @mbggenerated + */ + public Date getModifyTime() { + return modifyTime; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column contract_info.modify_time + * + * @param modifyTime the value for contract_info.modify_time + * + * @mbggenerated + */ + public void setModifyTime(Date modifyTime) { + this.modifyTime = modifyTime; + } +} \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/ContractInfoMapper.java b/src/main/java/com/soft/line/mapper/ContractInfoMapper.java new file mode 100644 index 0000000..759ec89 --- /dev/null +++ b/src/main/java/com/soft/line/mapper/ContractInfoMapper.java @@ -0,0 +1,30 @@ +package com.soft.line.mapper; + +import com.soft.line.entity.ContractInfo; +import java.util.List; + +public interface ContractInfoMapper { + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table contract_info + * + * @mbggenerated + */ + int insert(ContractInfo record); + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table contract_info + * + * @mbggenerated + */ + ContractInfo selectByPrimaryKey(Long id); + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table contract_info + * + * @mbggenerated + */ + List selectAll(); +} \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml b/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml new file mode 100644 index 0000000..421a876 --- /dev/null +++ b/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml @@ -0,0 +1,65 @@ + + + + + + + + + + + + + + + + + + + + + + + + + insert into `contract_info` (`dep_id`, `contract_name`, `pro_id`, + `total amount`, `part_a`, `part_b`, + `sign_time`, `sign_addr`, `begin_date`, + `end_date`, `payment`, `cont_attachment`, + `note`, `modify_person`, `modify_time` + ) + values (#{depId,jdbcType=VARCHAR}, #{contractName,jdbcType=VARCHAR}, #{proId,jdbcType=VARCHAR}, + #{totalAmount,jdbcType=DECIMAL}, #{partA,jdbcType=VARCHAR}, #{partB,jdbcType=VARCHAR}, + #{signTime,jdbcType=TIMESTAMP}, #{signAddr,jdbcType=VARCHAR}, #{beginDate,jdbcType=TIMESTAMP}, + #{endDate,jdbcType=TIMESTAMP}, #{payment,jdbcType=VARCHAR}, #{contAttachment,jdbcType=VARCHAR}, + #{note,jdbcType=VARCHAR}, #{modifyPerson,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP} + ) + + + + \ No newline at end of file -- Gitee From c0ecc403cbd6f80178eca1660321d7347926ddf9 Mon Sep 17 00:00:00 2001 From: ljc <1119265069@qq.com> Date: Sun, 17 May 2020 22:37:36 +0800 Subject: [PATCH 016/211] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=AF=81=E4=B9=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...__com_github_jsqlparser_jsqlparser_1_2.xml | 13 + ...com_github_pagehelper_pagehelper_5_1_8.xml | 13 + ...elper_spring_boot_autoconfigure_1_2_10.xml | 13 + ..._pagehelper_spring_boot_starter_1_2_10.xml | 13 + .../Maven__io_jsonwebtoken_jjwt_0_6_0.xml | 13 + ..._io_lettuce_lettuce_core_5_2_2_RELEASE.xml | 13 + ...en__io_netty_netty_buffer_4_1_49_Final.xml | 13 + ...ven__io_netty_netty_codec_4_1_49_Final.xml | 13 + ...en__io_netty_netty_common_4_1_49_Final.xml | 13 + ...n__io_netty_netty_handler_4_1_49_Final.xml | 13 + ...__io_netty_netty_resolver_4_1_49_Final.xml | 13 + ..._io_netty_netty_transport_4_1_49_Final.xml | 13 + ...jectreactor_reactor_core_3_3_5_RELEASE.xml | 13 + ...reactivestreams_reactive_streams_1_0_3.xml | 13 + ...pring_boot_starter_cache_2_2_7_RELEASE.xml | 13 + ..._boot_starter_data_redis_2_2_7_RELEASE.xml | 13 + ...data_spring_data_commons_2_2_7_RELEASE.xml | 13 + ...ata_spring_data_keyvalue_2_2_7_RELEASE.xml | 13 + ...k_data_spring_data_redis_2_2_7_RELEASE.xml | 13 + ...k_spring_context_support_5_2_6_RELEASE.xml | 13 + ...ringframework_spring_oxm_5_2_6_RELEASE.xml | 13 + pom.xml | 31 +- softline-files-manage.iml | 27 +- .../controller/CertificateInfoController.java | 30 +- .../com/soft/line/entity/CertificateInfo.java | 77 ++--- .../java/com/soft/line/entity/CodeDetail.java | 259 +++++++++++++++ .../com/soft/line/entity/ContractInfo.java | 69 ++-- .../com/soft/line/entity/WorkJournal.java | 297 ++++++++++++++++++ .../line/mapper/CertificateInfoMapper.java | 2 + .../line/mapper/CertificateInfoMapper.xml | 58 +++- .../soft/line/mapper/CodeDetailMapper.java | 24 ++ .../com/soft/line/mapper/CodeDetailMapper.xml | 30 ++ .../soft/line/mapper/ContractInfoMapper.xml | 62 ++-- .../soft/line/mapper/WorkJournalMapper.java | 30 ++ .../soft/line/mapper/WorkJournalMapper.xml | 50 +++ .../line/service/CertificateInfoService.java | 6 +- .../soft/line/service/CodeDetailService.java | 5 + .../impl/CertificateInfoServiceImpl.java | 15 +- .../service/impl/CodeDetailServiceImpl.java | 20 ++ .../line/util/config/PageHelperConfig.java | 14 + .../soft/line/util/config/Swagger2Config.java | 28 ++ .../line/util/generator/mybatis-generator.xml | 72 ++++- 42 files changed, 1347 insertions(+), 132 deletions(-) create mode 100644 .idea/libraries/Maven__com_github_jsqlparser_jsqlparser_1_2.xml create mode 100644 .idea/libraries/Maven__com_github_pagehelper_pagehelper_5_1_8.xml create mode 100644 .idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_autoconfigure_1_2_10.xml create mode 100644 .idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_starter_1_2_10.xml create mode 100644 .idea/libraries/Maven__io_jsonwebtoken_jjwt_0_6_0.xml create mode 100644 .idea/libraries/Maven__io_lettuce_lettuce_core_5_2_2_RELEASE.xml create mode 100644 .idea/libraries/Maven__io_netty_netty_buffer_4_1_49_Final.xml create mode 100644 .idea/libraries/Maven__io_netty_netty_codec_4_1_49_Final.xml create mode 100644 .idea/libraries/Maven__io_netty_netty_common_4_1_49_Final.xml create mode 100644 .idea/libraries/Maven__io_netty_netty_handler_4_1_49_Final.xml create mode 100644 .idea/libraries/Maven__io_netty_netty_resolver_4_1_49_Final.xml create mode 100644 .idea/libraries/Maven__io_netty_netty_transport_4_1_49_Final.xml create mode 100644 .idea/libraries/Maven__io_projectreactor_reactor_core_3_3_5_RELEASE.xml create mode 100644 .idea/libraries/Maven__org_reactivestreams_reactive_streams_1_0_3.xml create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_cache_2_2_7_RELEASE.xml create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_redis_2_2_7_RELEASE.xml create mode 100644 .idea/libraries/Maven__org_springframework_data_spring_data_commons_2_2_7_RELEASE.xml create mode 100644 .idea/libraries/Maven__org_springframework_data_spring_data_keyvalue_2_2_7_RELEASE.xml create mode 100644 .idea/libraries/Maven__org_springframework_data_spring_data_redis_2_2_7_RELEASE.xml create mode 100644 .idea/libraries/Maven__org_springframework_spring_context_support_5_2_6_RELEASE.xml create mode 100644 .idea/libraries/Maven__org_springframework_spring_oxm_5_2_6_RELEASE.xml create mode 100644 src/main/java/com/soft/line/entity/CodeDetail.java create mode 100644 src/main/java/com/soft/line/entity/WorkJournal.java create mode 100644 src/main/java/com/soft/line/mapper/CodeDetailMapper.java create mode 100644 src/main/java/com/soft/line/mapper/CodeDetailMapper.xml create mode 100644 src/main/java/com/soft/line/mapper/WorkJournalMapper.java create mode 100644 src/main/java/com/soft/line/mapper/WorkJournalMapper.xml create mode 100644 src/main/java/com/soft/line/service/CodeDetailService.java create mode 100644 src/main/java/com/soft/line/service/impl/CodeDetailServiceImpl.java create mode 100644 src/main/java/com/soft/line/util/config/PageHelperConfig.java diff --git a/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_1_2.xml b/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_1_2.xml new file mode 100644 index 0000000..e367d9d --- /dev/null +++ b/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_pagehelper_pagehelper_5_1_8.xml b/.idea/libraries/Maven__com_github_pagehelper_pagehelper_5_1_8.xml new file mode 100644 index 0000000..f57da67 --- /dev/null +++ b/.idea/libraries/Maven__com_github_pagehelper_pagehelper_5_1_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_autoconfigure_1_2_10.xml b/.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_autoconfigure_1_2_10.xml new file mode 100644 index 0000000..a2ad2ef --- /dev/null +++ b/.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_autoconfigure_1_2_10.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_starter_1_2_10.xml b/.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_starter_1_2_10.xml new file mode 100644 index 0000000..2737662 --- /dev/null +++ b/.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_starter_1_2_10.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_jsonwebtoken_jjwt_0_6_0.xml b/.idea/libraries/Maven__io_jsonwebtoken_jjwt_0_6_0.xml new file mode 100644 index 0000000..0d2cb5b --- /dev/null +++ b/.idea/libraries/Maven__io_jsonwebtoken_jjwt_0_6_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_lettuce_lettuce_core_5_2_2_RELEASE.xml b/.idea/libraries/Maven__io_lettuce_lettuce_core_5_2_2_RELEASE.xml new file mode 100644 index 0000000..756fa16 --- /dev/null +++ b/.idea/libraries/Maven__io_lettuce_lettuce_core_5_2_2_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_buffer_4_1_49_Final.xml b/.idea/libraries/Maven__io_netty_netty_buffer_4_1_49_Final.xml new file mode 100644 index 0000000..ec1ee45 --- /dev/null +++ b/.idea/libraries/Maven__io_netty_netty_buffer_4_1_49_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_codec_4_1_49_Final.xml b/.idea/libraries/Maven__io_netty_netty_codec_4_1_49_Final.xml new file mode 100644 index 0000000..8f7887f --- /dev/null +++ b/.idea/libraries/Maven__io_netty_netty_codec_4_1_49_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_common_4_1_49_Final.xml b/.idea/libraries/Maven__io_netty_netty_common_4_1_49_Final.xml new file mode 100644 index 0000000..fd10286 --- /dev/null +++ b/.idea/libraries/Maven__io_netty_netty_common_4_1_49_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_handler_4_1_49_Final.xml b/.idea/libraries/Maven__io_netty_netty_handler_4_1_49_Final.xml new file mode 100644 index 0000000..00a7d1a --- /dev/null +++ b/.idea/libraries/Maven__io_netty_netty_handler_4_1_49_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_resolver_4_1_49_Final.xml b/.idea/libraries/Maven__io_netty_netty_resolver_4_1_49_Final.xml new file mode 100644 index 0000000..dba9235 --- /dev/null +++ b/.idea/libraries/Maven__io_netty_netty_resolver_4_1_49_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_transport_4_1_49_Final.xml b/.idea/libraries/Maven__io_netty_netty_transport_4_1_49_Final.xml new file mode 100644 index 0000000..b67c210 --- /dev/null +++ b/.idea/libraries/Maven__io_netty_netty_transport_4_1_49_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_projectreactor_reactor_core_3_3_5_RELEASE.xml b/.idea/libraries/Maven__io_projectreactor_reactor_core_3_3_5_RELEASE.xml new file mode 100644 index 0000000..183b184 --- /dev/null +++ b/.idea/libraries/Maven__io_projectreactor_reactor_core_3_3_5_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_reactivestreams_reactive_streams_1_0_3.xml b/.idea/libraries/Maven__org_reactivestreams_reactive_streams_1_0_3.xml new file mode 100644 index 0000000..1a02c00 --- /dev/null +++ b/.idea/libraries/Maven__org_reactivestreams_reactive_streams_1_0_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_cache_2_2_7_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_cache_2_2_7_RELEASE.xml new file mode 100644 index 0000000..5525792 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_cache_2_2_7_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_redis_2_2_7_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_redis_2_2_7_RELEASE.xml new file mode 100644 index 0000000..44a48d4 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_redis_2_2_7_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_2_7_RELEASE.xml b/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_2_7_RELEASE.xml new file mode 100644 index 0000000..ddea81d --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_2_7_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_data_spring_data_keyvalue_2_2_7_RELEASE.xml b/.idea/libraries/Maven__org_springframework_data_spring_data_keyvalue_2_2_7_RELEASE.xml new file mode 100644 index 0000000..7b4410a --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_data_spring_data_keyvalue_2_2_7_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_data_spring_data_redis_2_2_7_RELEASE.xml b/.idea/libraries/Maven__org_springframework_data_spring_data_redis_2_2_7_RELEASE.xml new file mode 100644 index 0000000..c844756 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_data_spring_data_redis_2_2_7_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_support_5_2_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_support_5_2_6_RELEASE.xml new file mode 100644 index 0000000..48fea4a --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_support_5_2_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_oxm_5_2_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_oxm_5_2_6_RELEASE.xml new file mode 100644 index 0000000..129bb16 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_oxm_5_2_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index b9ebf52..57106b3 100644 --- a/pom.xml +++ b/pom.xml @@ -90,12 +90,13 @@ ${apache.commons-text.version} - + org.projectlombok lombok 1.18.12 + + + com.github.pagehelper + pagehelper-spring-boot-starter + 1.2.10 + + + + + io.jsonwebtoken + jjwt + 0.6.0 + + + + + org.springframework.boot + spring-boot-starter-data-redis + + + + + org.springframework.boot + spring-boot-starter-cache + + @@ -144,6 +172,7 @@ org.springframework.boot spring-boot-maven-plugin + 2.1.2.RELEASE org.mybatis.generator diff --git a/softline-files-manage.iml b/softline-files-manage.iml index b4fd046..dfebf7b 100644 --- a/softline-files-manage.iml +++ b/softline-files-manage.iml @@ -38,14 +38,11 @@ - - - @@ -127,5 +124,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/soft/line/controller/CertificateInfoController.java b/src/main/java/com/soft/line/controller/CertificateInfoController.java index a17f135..aca078e 100644 --- a/src/main/java/com/soft/line/controller/CertificateInfoController.java +++ b/src/main/java/com/soft/line/controller/CertificateInfoController.java @@ -1,7 +1,9 @@ package com.soft.line.controller; import com.soft.line.entity.CertificateInfo; +import com.soft.line.entity.CodeDetail; import com.soft.line.service.CertificateInfoService; +import com.soft.line.service.CodeDetailService; import com.soft.line.util.exception.CommonResult; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -21,7 +23,7 @@ import java.util.Map; * @version 0.1 */ -@Api(description = "证书接口") +@Api(value = "证书接口",description = "证书接口") @Slf4j @RestController @RequestMapping("/certificateInfo") @@ -29,6 +31,8 @@ public class CertificateInfoController { @Autowired private CertificateInfoService certificateInfoService; + @Autowired + private CodeDetailService codeDetailService; @@ -36,14 +40,24 @@ public class CertificateInfoController { @ApiOperation(value = "个人证书列表", notes = "证书列表") //设置请求参数 @ApiImplicitParams({ - // @ApiImplicitParam(paramType = "query", name = "userName", value = "名称", required = false, dataType = "String"), - // @ApiImplicitParam(paramType = "query", name = "dicCode", value = "编码", required = false, dataType = "String") - // ..... + @ApiImplicitParam(name = "id", value = "用户ID", required = true, dataType = "Long", paramType = "path") }) - @GetMapping("/getPersonalAll/{userName}") - public CommonResult> getPersonalAll(@PathVariable("userName") String userName) { - - return CommonResult.success(certificateInfoService.getPersonalAll(userName)); + @GetMapping("getCertificate/{id}") + public CommonResult getCertificateInfoByID(@PathVariable("id") Long id) { + CertificateInfo ci = certificateInfoService.selectByPrimaryKey2(id); + ci.setCertType(codeDetailService.selectContent1ByPrimaryKey("3",ci.getCertType())); + return CommonResult.success(ci); + } + @ApiOperation(value = "个人证书列表", notes = "证书列表") + //设置请求参数 + @ApiImplicitParams({ + @ApiImplicitParam(name = "id", value = "用户ID", required = true, dataType = "Long", paramType = "path") + }) + @GetMapping("updateCertificate") + public CommonResult updateCertificateInfoByID(@PathVariable("id") Long id) { + CertificateInfo ci = certificateInfoService.selectByPrimaryKey2(id); + ci.setCertType(codeDetailService.selectContent1ByPrimaryKey("3",ci.getCertType())); + return CommonResult.success(ci); } } diff --git a/src/main/java/com/soft/line/entity/CertificateInfo.java b/src/main/java/com/soft/line/entity/CertificateInfo.java index 17c2d2c..571868d 100644 --- a/src/main/java/com/soft/line/entity/CertificateInfo.java +++ b/src/main/java/com/soft/line/entity/CertificateInfo.java @@ -1,5 +1,7 @@ package com.soft.line.entity; +import com.fasterxml.jackson.annotation.JsonFormat; + import java.util.Date; public class CertificateInfo { @@ -17,7 +19,7 @@ public class CertificateInfo { * * @mbggenerated */ - private Long certId; + private String certId; /** * This field was generated by MyBatis Generator. @@ -49,6 +51,7 @@ public class CertificateInfo { * * @mbggenerated */ + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "Asia/Shanghai") private Date beginDate; /** @@ -57,16 +60,9 @@ public class CertificateInfo { * * @mbggenerated */ + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "Asia/Shanghai") private Date endDate; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column certificate_info.cert_attachment - * - * @mbggenerated - */ - private String certAttachment; - /** * This field was generated by MyBatis Generator. * This field corresponds to the database column certificate_info.note @@ -89,8 +85,17 @@ public class CertificateInfo { * * @mbggenerated */ + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "Asia/Shanghai") private Date modifyTime; + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column certificate_info.del_flg + * + * @mbggenerated + */ + private Integer delFlg; + /** * This method was generated by MyBatis Generator. * This method returns the value of the database column certificate_info.id @@ -123,7 +128,7 @@ public class CertificateInfo { * * @mbggenerated */ - public Long getCertId() { + public String getCertId() { return certId; } @@ -135,8 +140,8 @@ public class CertificateInfo { * * @mbggenerated */ - public void setCertId(Long certId) { - this.certId = certId; + public void setCertId(String certId) { + this.certId = certId == null ? null : certId.trim(); } /** @@ -259,30 +264,6 @@ public class CertificateInfo { this.endDate = endDate; } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column certificate_info.cert_attachment - * - * @return the value of certificate_info.cert_attachment - * - * @mbggenerated - */ - public String getCertAttachment() { - return certAttachment; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column certificate_info.cert_attachment - * - * @param certAttachment the value for certificate_info.cert_attachment - * - * @mbggenerated - */ - public void setCertAttachment(String certAttachment) { - this.certAttachment = certAttachment == null ? null : certAttachment.trim(); - } - /** * This method was generated by MyBatis Generator. * This method returns the value of the database column certificate_info.note @@ -354,4 +335,28 @@ public class CertificateInfo { public void setModifyTime(Date modifyTime) { this.modifyTime = modifyTime; } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column certificate_info.del_flg + * + * @return the value of certificate_info.del_flg + * + * @mbggenerated + */ + public Integer getDelFlg() { + return delFlg; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column certificate_info.del_flg + * + * @param delFlg the value for certificate_info.del_flg + * + * @mbggenerated + */ + public void setDelFlg(Integer delFlg) { + this.delFlg = delFlg; + } } \ No newline at end of file diff --git a/src/main/java/com/soft/line/entity/CodeDetail.java b/src/main/java/com/soft/line/entity/CodeDetail.java new file mode 100644 index 0000000..7d43f46 --- /dev/null +++ b/src/main/java/com/soft/line/entity/CodeDetail.java @@ -0,0 +1,259 @@ +package com.soft.line.entity; + +public class CodeDetail { + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column code_detail.code_type + * + * @mbggenerated + */ + private String codeType; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column code_detail.code_detail + * + * @mbggenerated + */ + private String codeDetail; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column code_detail.code_content1 + * + * @mbggenerated + */ + private String codeContent1; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column code_detail.code_content2 + * + * @mbggenerated + */ + private String codeContent2; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column code_detail.code_content3 + * + * @mbggenerated + */ + private String codeContent3; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column code_detail.code_content4 + * + * @mbggenerated + */ + private String codeContent4; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column code_detail.orderby + * + * @mbggenerated + */ + private Integer orderby; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column code_detail.note + * + * @mbggenerated + */ + private String note; + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column code_detail.code_type + * + * @return the value of code_detail.code_type + * + * @mbggenerated + */ + public String getCodeType() { + return codeType; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column code_detail.code_type + * + * @param codeType the value for code_detail.code_type + * + * @mbggenerated + */ + public void setCodeType(String codeType) { + this.codeType = codeType == null ? null : codeType.trim(); + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column code_detail.code_detail + * + * @return the value of code_detail.code_detail + * + * @mbggenerated + */ + public String getCodeDetail() { + return codeDetail; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column code_detail.code_detail + * + * @param codeDetail the value for code_detail.code_detail + * + * @mbggenerated + */ + public void setCodeDetail(String codeDetail) { + this.codeDetail = codeDetail == null ? null : codeDetail.trim(); + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column code_detail.code_content1 + * + * @return the value of code_detail.code_content1 + * + * @mbggenerated + */ + public String getCodeContent1() { + return codeContent1; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column code_detail.code_content1 + * + * @param codeContent1 the value for code_detail.code_content1 + * + * @mbggenerated + */ + public void setCodeContent1(String codeContent1) { + this.codeContent1 = codeContent1 == null ? null : codeContent1.trim(); + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column code_detail.code_content2 + * + * @return the value of code_detail.code_content2 + * + * @mbggenerated + */ + public String getCodeContent2() { + return codeContent2; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column code_detail.code_content2 + * + * @param codeContent2 the value for code_detail.code_content2 + * + * @mbggenerated + */ + public void setCodeContent2(String codeContent2) { + this.codeContent2 = codeContent2 == null ? null : codeContent2.trim(); + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column code_detail.code_content3 + * + * @return the value of code_detail.code_content3 + * + * @mbggenerated + */ + public String getCodeContent3() { + return codeContent3; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column code_detail.code_content3 + * + * @param codeContent3 the value for code_detail.code_content3 + * + * @mbggenerated + */ + public void setCodeContent3(String codeContent3) { + this.codeContent3 = codeContent3 == null ? null : codeContent3.trim(); + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column code_detail.code_content4 + * + * @return the value of code_detail.code_content4 + * + * @mbggenerated + */ + public String getCodeContent4() { + return codeContent4; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column code_detail.code_content4 + * + * @param codeContent4 the value for code_detail.code_content4 + * + * @mbggenerated + */ + public void setCodeContent4(String codeContent4) { + this.codeContent4 = codeContent4 == null ? null : codeContent4.trim(); + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column code_detail.orderby + * + * @return the value of code_detail.orderby + * + * @mbggenerated + */ + public Integer getOrderby() { + return orderby; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column code_detail.orderby + * + * @param orderby the value for code_detail.orderby + * + * @mbggenerated + */ + public void setOrderby(Integer orderby) { + this.orderby = orderby; + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column code_detail.note + * + * @return the value of code_detail.note + * + * @mbggenerated + */ + public String getNote() { + return note; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column code_detail.note + * + * @param note the value for code_detail.note + * + * @mbggenerated + */ + public void setNote(String note) { + this.note = note == null ? null : note.trim(); + } +} \ No newline at end of file diff --git a/src/main/java/com/soft/line/entity/ContractInfo.java b/src/main/java/com/soft/line/entity/ContractInfo.java index 69c404b..c8f077a 100644 --- a/src/main/java/com/soft/line/entity/ContractInfo.java +++ b/src/main/java/com/soft/line/entity/ContractInfo.java @@ -1,5 +1,7 @@ package com.soft.line.entity; +import com.fasterxml.jackson.annotation.JsonFormat; + import java.math.BigDecimal; import java.util.Date; @@ -82,6 +84,7 @@ public class ContractInfo { * * @mbggenerated */ + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "Asia/Shanghai") private Date beginDate; /** @@ -90,6 +93,7 @@ public class ContractInfo { * * @mbggenerated */ + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "Asia/Shanghai") private Date endDate; /** @@ -100,14 +104,6 @@ public class ContractInfo { */ private String payment; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column contract_info.cont_attachment - * - * @mbggenerated - */ - private String contAttachment; - /** * This field was generated by MyBatis Generator. * This field corresponds to the database column contract_info.note @@ -130,8 +126,17 @@ public class ContractInfo { * * @mbggenerated */ + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "Asia/Shanghai") private Date modifyTime; + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column contract_info.del_flg + * + * @mbggenerated + */ + private Integer delFlg; + /** * This method was generated by MyBatis Generator. * This method returns the value of the database column contract_info.id @@ -420,30 +425,6 @@ public class ContractInfo { this.payment = payment == null ? null : payment.trim(); } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column contract_info.cont_attachment - * - * @return the value of contract_info.cont_attachment - * - * @mbggenerated - */ - public String getContAttachment() { - return contAttachment; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column contract_info.cont_attachment - * - * @param contAttachment the value for contract_info.cont_attachment - * - * @mbggenerated - */ - public void setContAttachment(String contAttachment) { - this.contAttachment = contAttachment == null ? null : contAttachment.trim(); - } - /** * This method was generated by MyBatis Generator. * This method returns the value of the database column contract_info.note @@ -515,4 +496,28 @@ public class ContractInfo { public void setModifyTime(Date modifyTime) { this.modifyTime = modifyTime; } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column contract_info.del_flg + * + * @return the value of contract_info.del_flg + * + * @mbggenerated + */ + public Integer getDelFlg() { + return delFlg; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column contract_info.del_flg + * + * @param delFlg the value for contract_info.del_flg + * + * @mbggenerated + */ + public void setDelFlg(Integer delFlg) { + this.delFlg = delFlg; + } } \ No newline at end of file diff --git a/src/main/java/com/soft/line/entity/WorkJournal.java b/src/main/java/com/soft/line/entity/WorkJournal.java new file mode 100644 index 0000000..2932bba --- /dev/null +++ b/src/main/java/com/soft/line/entity/WorkJournal.java @@ -0,0 +1,297 @@ +package com.soft.line.entity; + +import com.fasterxml.jackson.annotation.JsonFormat; + +import java.util.Date; + +public class WorkJournal { + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column work_journal.id + * + * @mbggenerated + */ + private Long id; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column work_journal.work_type + * + * @mbggenerated + */ + private String workType; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column work_journal.work_table + * + * @mbggenerated + */ + private String workTable; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column work_journal.work_table_seq + * + * @mbggenerated + */ + private Long workTableSeq; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column work_journal.work_date + * + * @mbggenerated + */ + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "Asia/Shanghai") + private Date workDate; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column work_journal.note + * + * @mbggenerated + */ + private String note; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column work_journal.modify_person + * + * @mbggenerated + */ + private String modifyPerson; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column work_journal.modify_time + * + * @mbggenerated + */ + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "Asia/Shanghai") + private Date modifyTime; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column work_journal.db_op_type + * + * @mbggenerated + */ + private String dbOpType; + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column work_journal.id + * + * @return the value of work_journal.id + * + * @mbggenerated + */ + public Long getId() { + return id; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column work_journal.id + * + * @param id the value for work_journal.id + * + * @mbggenerated + */ + public void setId(Long id) { + this.id = id; + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column work_journal.work_type + * + * @return the value of work_journal.work_type + * + * @mbggenerated + */ + public String getWorkType() { + return workType; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column work_journal.work_type + * + * @param workType the value for work_journal.work_type + * + * @mbggenerated + */ + public void setWorkType(String workType) { + this.workType = workType == null ? null : workType.trim(); + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column work_journal.work_table + * + * @return the value of work_journal.work_table + * + * @mbggenerated + */ + public String getWorkTable() { + return workTable; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column work_journal.work_table + * + * @param workTable the value for work_journal.work_table + * + * @mbggenerated + */ + public void setWorkTable(String workTable) { + this.workTable = workTable == null ? null : workTable.trim(); + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column work_journal.work_table_seq + * + * @return the value of work_journal.work_table_seq + * + * @mbggenerated + */ + public Long getWorkTableSeq() { + return workTableSeq; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column work_journal.work_table_seq + * + * @param workTableSeq the value for work_journal.work_table_seq + * + * @mbggenerated + */ + public void setWorkTableSeq(Long workTableSeq) { + this.workTableSeq = workTableSeq; + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column work_journal.work_date + * + * @return the value of work_journal.work_date + * + * @mbggenerated + */ + public Date getWorkDate() { + return workDate; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column work_journal.work_date + * + * @param workDate the value for work_journal.work_date + * + * @mbggenerated + */ + public void setWorkDate(Date workDate) { + this.workDate = workDate; + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column work_journal.note + * + * @return the value of work_journal.note + * + * @mbggenerated + */ + public String getNote() { + return note; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column work_journal.note + * + * @param note the value for work_journal.note + * + * @mbggenerated + */ + public void setNote(String note) { + this.note = note == null ? null : note.trim(); + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column work_journal.modify_person + * + * @return the value of work_journal.modify_person + * + * @mbggenerated + */ + public String getModifyPerson() { + return modifyPerson; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column work_journal.modify_person + * + * @param modifyPerson the value for work_journal.modify_person + * + * @mbggenerated + */ + public void setModifyPerson(String modifyPerson) { + this.modifyPerson = modifyPerson == null ? null : modifyPerson.trim(); + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column work_journal.modify_time + * + * @return the value of work_journal.modify_time + * + * @mbggenerated + */ + public Date getModifyTime() { + return modifyTime; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column work_journal.modify_time + * + * @param modifyTime the value for work_journal.modify_time + * + * @mbggenerated + */ + public void setModifyTime(Date modifyTime) { + this.modifyTime = modifyTime; + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column work_journal.db_op_type + * + * @return the value of work_journal.db_op_type + * + * @mbggenerated + */ + public String getDbOpType() { + return dbOpType; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column work_journal.db_op_type + * + * @param dbOpType the value for work_journal.db_op_type + * + * @mbggenerated + */ + public void setDbOpType(String dbOpType) { + this.dbOpType = dbOpType == null ? null : dbOpType.trim(); + } +} \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/CertificateInfoMapper.java b/src/main/java/com/soft/line/mapper/CertificateInfoMapper.java index 54102b5..187300a 100644 --- a/src/main/java/com/soft/line/mapper/CertificateInfoMapper.java +++ b/src/main/java/com/soft/line/mapper/CertificateInfoMapper.java @@ -20,6 +20,8 @@ public interface CertificateInfoMapper { */ CertificateInfo selectByPrimaryKey(Long id); + CertificateInfo selectByPrimaryKey2(Long id); + /** * This method was generated by MyBatis Generator. * This method corresponds to the database table certificate_info diff --git a/src/main/java/com/soft/line/mapper/CertificateInfoMapper.xml b/src/main/java/com/soft/line/mapper/CertificateInfoMapper.xml index a901091..1b1bf59 100644 --- a/src/main/java/com/soft/line/mapper/CertificateInfoMapper.xml +++ b/src/main/java/com/soft/line/mapper/CertificateInfoMapper.xml @@ -7,16 +7,16 @@ This element is automatically generated by MyBatis Generator, do not modify. --> - + - + insert into `certificate_info` (`cert_id`, `cert_type`, `cert_name`, `cert_unit`, `begin_date`, `end_date`, - `cert_attachment`, `note`, `modify_person`, - `modify_time`) - values (#{certId,jdbcType=BIGINT}, #{certType,jdbcType=VARCHAR}, #{certName,jdbcType=VARCHAR}, + `note`, `modify_person`, `modify_time`, + `del_flg`) + values (#{certId,jdbcType=VARCHAR}, #{certType,jdbcType=VARCHAR}, #{certName,jdbcType=VARCHAR}, #{certUnit,jdbcType=VARCHAR}, #{beginDate,jdbcType=TIMESTAMP}, #{endDate,jdbcType=TIMESTAMP}, - #{certAttachment,jdbcType=VARCHAR}, #{note,jdbcType=VARCHAR}, #{modifyPerson,jdbcType=VARCHAR}, - #{modifyTime,jdbcType=TIMESTAMP}) + #{note,jdbcType=VARCHAR}, #{modifyPerson,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}, + #{delFlg,jdbcType=INTEGER}) + + - + \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/CodeDetailMapper.java b/src/main/java/com/soft/line/mapper/CodeDetailMapper.java new file mode 100644 index 0000000..228ebc9 --- /dev/null +++ b/src/main/java/com/soft/line/mapper/CodeDetailMapper.java @@ -0,0 +1,24 @@ +package com.soft.line.mapper; + +import com.soft.line.entity.CodeDetail; +import java.util.List; +import org.apache.ibatis.annotations.Param; + +public interface CodeDetailMapper { + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table code_detail + * + * @mbggenerated + */ + String selectContent1ByPrimaryKey(String codeType, String codeDetail); + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table code_detail + * + * @mbggenerated + */ + List selectAllContent1ByCodeType(String codeType); +} \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/CodeDetailMapper.xml b/src/main/java/com/soft/line/mapper/CodeDetailMapper.xml new file mode 100644 index 0000000..a9caca5 --- /dev/null +++ b/src/main/java/com/soft/line/mapper/CodeDetailMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml b/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml index 421a876..9dd82c1 100644 --- a/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml +++ b/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml @@ -1,29 +1,29 @@ - - - - + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - + select `id`, `dep_id`, `contract_name`, `pro_id`, `total amount`, `part_a`, `part_b`, - `sign_time`, `sign_addr`, `begin_date`, `end_date`, `payment`, `cont_attachment`, - `note`, `modify_person`, `modify_time` + `sign_time`, `sign_addr`, `begin_date`, `end_date`, `payment`, `note`, `modify_person`, + `modify_time`, `del_flg` from `contract_info` where `id` = #{id,jdbcType=BIGINT} - select `id`, `dep_id`, `contract_name`, `pro_id`, `total amount`, `part_a`, `part_b`, - `sign_time`, `sign_addr`, `begin_date`, `end_date`, `payment`, `cont_attachment`, - `note`, `modify_person`, `modify_time` + `sign_time`, `sign_addr`, `begin_date`, `end_date`, `payment`, `note`, `modify_person`, + `modify_time`, `del_flg` from `contract_info` \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/WorkJournalMapper.java b/src/main/java/com/soft/line/mapper/WorkJournalMapper.java new file mode 100644 index 0000000..09283eb --- /dev/null +++ b/src/main/java/com/soft/line/mapper/WorkJournalMapper.java @@ -0,0 +1,30 @@ +package com.soft.line.mapper; + +import com.soft.line.entity.WorkJournal; +import java.util.List; + +public interface WorkJournalMapper { + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table work_journal + * + * @mbggenerated + */ + int insert(WorkJournal record); + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table work_journal + * + * @mbggenerated + */ + WorkJournal selectByPrimaryKey(Long id); + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table work_journal + * + * @mbggenerated + */ + List selectAll(); +} \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/WorkJournalMapper.xml b/src/main/java/com/soft/line/mapper/WorkJournalMapper.xml new file mode 100644 index 0000000..1f244c8 --- /dev/null +++ b/src/main/java/com/soft/line/mapper/WorkJournalMapper.xml @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + insert into `work_journal` (`work_type`, `work_table`, `work_table_seq`, + `work_date`, `note`, `modify_person`, + `modify_time`, `db_op_type`) + values (#{workType,jdbcType=VARCHAR}, #{workTable,jdbcType=VARCHAR}, #{workTableSeq,jdbcType=BIGINT}, + #{workDate,jdbcType=TIMESTAMP}, #{note,jdbcType=VARCHAR}, #{modifyPerson,jdbcType=VARCHAR}, + #{modifyTime,jdbcType=TIMESTAMP}, #{dbOpType,jdbcType=VARCHAR}) + + + + \ No newline at end of file diff --git a/src/main/java/com/soft/line/service/CertificateInfoService.java b/src/main/java/com/soft/line/service/CertificateInfoService.java index 98bc6a7..7ce0b4b 100644 --- a/src/main/java/com/soft/line/service/CertificateInfoService.java +++ b/src/main/java/com/soft/line/service/CertificateInfoService.java @@ -14,5 +14,9 @@ import java.util.List; public interface CertificateInfoService { - public List getPersonalAll(String userName); + public List selectCertificateAll(); + + public CertificateInfo selectByPrimaryKey(Long id); + + public CertificateInfo selectByPrimaryKey2(Long id); } diff --git a/src/main/java/com/soft/line/service/CodeDetailService.java b/src/main/java/com/soft/line/service/CodeDetailService.java new file mode 100644 index 0000000..440b9c9 --- /dev/null +++ b/src/main/java/com/soft/line/service/CodeDetailService.java @@ -0,0 +1,5 @@ +package com.soft.line.service; + +public interface CodeDetailService { + public String selectContent1ByPrimaryKey(String codeType,String codeDetail); +} diff --git a/src/main/java/com/soft/line/service/impl/CertificateInfoServiceImpl.java b/src/main/java/com/soft/line/service/impl/CertificateInfoServiceImpl.java index 4070152..e850cf8 100644 --- a/src/main/java/com/soft/line/service/impl/CertificateInfoServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/CertificateInfoServiceImpl.java @@ -19,8 +19,19 @@ public class CertificateInfoServiceImpl implements CertificateInfoService { @Autowired private CertificateInfoMapper certificateInfoMapper; + + @Override + public List selectCertificateAll() { + return certificateInfoMapper.selectAll(); + } + + @Override + public CertificateInfo selectByPrimaryKey(Long id) { + return certificateInfoMapper.selectByPrimaryKey(id); + } + @Override - public List getPersonalAll(String userName) { - return certificateInfoMapper.getPersonalAll(userName); + public CertificateInfo selectByPrimaryKey2(Long id) { + return certificateInfoMapper.selectByPrimaryKey2(id); } } diff --git a/src/main/java/com/soft/line/service/impl/CodeDetailServiceImpl.java b/src/main/java/com/soft/line/service/impl/CodeDetailServiceImpl.java new file mode 100644 index 0000000..2938769 --- /dev/null +++ b/src/main/java/com/soft/line/service/impl/CodeDetailServiceImpl.java @@ -0,0 +1,20 @@ +package com.soft.line.service.impl; + +import com.soft.line.entity.CodeDetail; +import com.soft.line.mapper.CodeDetailMapper; +import com.soft.line.service.CodeDetailService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +@Service +@Slf4j +public class CodeDetailServiceImpl implements CodeDetailService { + @Autowired + private CodeDetailMapper codeDetailMapper; + + @Override + public String selectContent1ByPrimaryKey(String codeType, String codeDetail) { + return codeDetailMapper.selectContent1ByPrimaryKey(codeType,codeDetail); + } +} diff --git a/src/main/java/com/soft/line/util/config/PageHelperConfig.java b/src/main/java/com/soft/line/util/config/PageHelperConfig.java new file mode 100644 index 0000000..e7a24b7 --- /dev/null +++ b/src/main/java/com/soft/line/util/config/PageHelperConfig.java @@ -0,0 +1,14 @@ +package com.soft.line.util.config; + +import com.github.pagehelper.PageHelper; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class PageHelperConfig { + @Bean + public PageHelper createPaeHelper(){ + PageHelper page= new PageHelper(); + return page; + } +} diff --git a/src/main/java/com/soft/line/util/config/Swagger2Config.java b/src/main/java/com/soft/line/util/config/Swagger2Config.java index 3659018..afc7e73 100644 --- a/src/main/java/com/soft/line/util/config/Swagger2Config.java +++ b/src/main/java/com/soft/line/util/config/Swagger2Config.java @@ -1,6 +1,14 @@ package com.soft.line.util.config; +import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import springfox.documentation.builders.ApiInfoBuilder; +import springfox.documentation.builders.PathSelectors; +import springfox.documentation.builders.RequestHandlerSelectors; +import springfox.documentation.service.ApiInfo; +import springfox.documentation.service.Contact; +import springfox.documentation.spi.DocumentationType; +import springfox.documentation.spring.web.plugins.Docket; import springfox.documentation.swagger2.annotations.EnableSwagger2; /** @@ -11,4 +19,24 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2; @Configuration @EnableSwagger2 public class Swagger2Config { + @Bean + public Docket createRestApi() { + return new Docket(DocumentationType.SWAGGER_2) + .apiInfo(apiInfo()) + .select() + .apis(RequestHandlerSelectors.basePackage("com.soft.line.controller")) + .paths(PathSelectors.any()) + .build(); + } + + private ApiInfo apiInfo() { + return new ApiInfoBuilder() + .title("Swagger接口列表") + .description("接口") + .termsOfServiceUrl("http://localhost:9100/swagger-ui.html") + .contact(new Contact("ljc", "http://www.softline.sh.cn", "154040976@qq.com")) + .version("1.1.0") + .build(); + } + } diff --git a/src/main/java/com/soft/line/util/generator/mybatis-generator.xml b/src/main/java/com/soft/line/util/generator/mybatis-generator.xml index d3ddc33..8520cf1 100644 --- a/src/main/java/com/soft/line/util/generator/mybatis-generator.xml +++ b/src/main/java/com/soft/line/util/generator/mybatis-generator.xml @@ -77,7 +77,7 @@ delimitAllColumns="true"> --> -
+ + +
--> + + +
+ + +
+ + +
+ + +
\ No newline at end of file -- Gitee From fc205ac33168e9565bcef9a3ea320a54aa605ef0 Mon Sep 17 00:00:00 2001 From: ljc <1119265069@qq.com> Date: Sun, 17 May 2020 22:38:07 +0800 Subject: [PATCH 017/211] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=AF=81=E4=B9=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/soft/line/entity/AttachementInfo.java | 168 ++++++++++++++++++ .../com/soft/line/entity/CertAttachInfo.java | 99 +++++++++++ .../com/soft/line/entity/ContAttachInfo.java | 99 +++++++++++ .../line/mapper/AttachementInfoMapper.java | 30 ++++ .../line/mapper/AttachementInfoMapper.xml | 42 +++++ .../line/mapper/CertAttachInfoMapper.java | 30 ++++ .../soft/line/mapper/CertAttachInfoMapper.xml | 38 ++++ .../line/mapper/ContAttachInfoMapper.java | 30 ++++ .../soft/line/mapper/ContAttachInfoMapper.xml | 38 ++++ 9 files changed, 574 insertions(+) create mode 100644 src/main/java/com/soft/line/entity/AttachementInfo.java create mode 100644 src/main/java/com/soft/line/entity/CertAttachInfo.java create mode 100644 src/main/java/com/soft/line/entity/ContAttachInfo.java create mode 100644 src/main/java/com/soft/line/mapper/AttachementInfoMapper.java create mode 100644 src/main/java/com/soft/line/mapper/AttachementInfoMapper.xml create mode 100644 src/main/java/com/soft/line/mapper/CertAttachInfoMapper.java create mode 100644 src/main/java/com/soft/line/mapper/CertAttachInfoMapper.xml create mode 100644 src/main/java/com/soft/line/mapper/ContAttachInfoMapper.java create mode 100644 src/main/java/com/soft/line/mapper/ContAttachInfoMapper.xml diff --git a/src/main/java/com/soft/line/entity/AttachementInfo.java b/src/main/java/com/soft/line/entity/AttachementInfo.java new file mode 100644 index 0000000..257070e --- /dev/null +++ b/src/main/java/com/soft/line/entity/AttachementInfo.java @@ -0,0 +1,168 @@ +package com.soft.line.entity; + +import com.fasterxml.jackson.annotation.JsonFormat; + +import java.util.Date; + +public class AttachementInfo { + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column attachement_info.id + * + * @mbggenerated + */ + private Long id; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column attachement_info.attachment_name + * + * @mbggenerated + */ + private String attachmentName; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column attachement_info.attachement_url + * + * @mbggenerated + */ + private String attachementUrl; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column attachement_info.modify_person + * + * @mbggenerated + */ + private String modifyPerson; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column attachement_info.modify_time + * + * @mbggenerated + */ + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "Asia/Shanghai") + private Date modifyTime; + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column attachement_info.id + * + * @return the value of attachement_info.id + * + * @mbggenerated + */ + public Long getId() { + return id; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column attachement_info.id + * + * @param id the value for attachement_info.id + * + * @mbggenerated + */ + public void setId(Long id) { + this.id = id; + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column attachement_info.attachment_name + * + * @return the value of attachement_info.attachment_name + * + * @mbggenerated + */ + public String getAttachmentName() { + return attachmentName; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column attachement_info.attachment_name + * + * @param attachmentName the value for attachement_info.attachment_name + * + * @mbggenerated + */ + public void setAttachmentName(String attachmentName) { + this.attachmentName = attachmentName == null ? null : attachmentName.trim(); + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column attachement_info.attachement_url + * + * @return the value of attachement_info.attachement_url + * + * @mbggenerated + */ + public String getAttachementUrl() { + return attachementUrl; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column attachement_info.attachement_url + * + * @param attachementUrl the value for attachement_info.attachement_url + * + * @mbggenerated + */ + public void setAttachementUrl(String attachementUrl) { + this.attachementUrl = attachementUrl == null ? null : attachementUrl.trim(); + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column attachement_info.modify_person + * + * @return the value of attachement_info.modify_person + * + * @mbggenerated + */ + public String getModifyPerson() { + return modifyPerson; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column attachement_info.modify_person + * + * @param modifyPerson the value for attachement_info.modify_person + * + * @mbggenerated + */ + public void setModifyPerson(String modifyPerson) { + this.modifyPerson = modifyPerson == null ? null : modifyPerson.trim(); + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column attachement_info.modify_time + * + * @return the value of attachement_info.modify_time + * + * @mbggenerated + */ + public Date getModifyTime() { + return modifyTime; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column attachement_info.modify_time + * + * @param modifyTime the value for attachement_info.modify_time + * + * @mbggenerated + */ + public void setModifyTime(Date modifyTime) { + this.modifyTime = modifyTime; + } +} \ No newline at end of file diff --git a/src/main/java/com/soft/line/entity/CertAttachInfo.java b/src/main/java/com/soft/line/entity/CertAttachInfo.java new file mode 100644 index 0000000..19c9378 --- /dev/null +++ b/src/main/java/com/soft/line/entity/CertAttachInfo.java @@ -0,0 +1,99 @@ +package com.soft.line.entity; + +public class CertAttachInfo { + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column cert_attach_info.id + * + * @mbggenerated + */ + private Long id; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column cert_attach_info.cert_id + * + * @mbggenerated + */ + private Long certId; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column cert_attach_info.attach_id + * + * @mbggenerated + */ + private Long attachId; + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column cert_attach_info.id + * + * @return the value of cert_attach_info.id + * + * @mbggenerated + */ + public Long getId() { + return id; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column cert_attach_info.id + * + * @param id the value for cert_attach_info.id + * + * @mbggenerated + */ + public void setId(Long id) { + this.id = id; + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column cert_attach_info.cert_id + * + * @return the value of cert_attach_info.cert_id + * + * @mbggenerated + */ + public Long getCertId() { + return certId; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column cert_attach_info.cert_id + * + * @param certId the value for cert_attach_info.cert_id + * + * @mbggenerated + */ + public void setCertId(Long certId) { + this.certId = certId; + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column cert_attach_info.attach_id + * + * @return the value of cert_attach_info.attach_id + * + * @mbggenerated + */ + public Long getAttachId() { + return attachId; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column cert_attach_info.attach_id + * + * @param attachId the value for cert_attach_info.attach_id + * + * @mbggenerated + */ + public void setAttachId(Long attachId) { + this.attachId = attachId; + } +} \ No newline at end of file diff --git a/src/main/java/com/soft/line/entity/ContAttachInfo.java b/src/main/java/com/soft/line/entity/ContAttachInfo.java new file mode 100644 index 0000000..1aa498e --- /dev/null +++ b/src/main/java/com/soft/line/entity/ContAttachInfo.java @@ -0,0 +1,99 @@ +package com.soft.line.entity; + +public class ContAttachInfo { + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column cont_attach_info.id + * + * @mbggenerated + */ + private Long id; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column cont_attach_info.cont_id + * + * @mbggenerated + */ + private Long contId; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column cont_attach_info.attach_id + * + * @mbggenerated + */ + private Long attachId; + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column cont_attach_info.id + * + * @return the value of cont_attach_info.id + * + * @mbggenerated + */ + public Long getId() { + return id; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column cont_attach_info.id + * + * @param id the value for cont_attach_info.id + * + * @mbggenerated + */ + public void setId(Long id) { + this.id = id; + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column cont_attach_info.cont_id + * + * @return the value of cont_attach_info.cont_id + * + * @mbggenerated + */ + public Long getContId() { + return contId; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column cont_attach_info.cont_id + * + * @param contId the value for cont_attach_info.cont_id + * + * @mbggenerated + */ + public void setContId(Long contId) { + this.contId = contId; + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column cont_attach_info.attach_id + * + * @return the value of cont_attach_info.attach_id + * + * @mbggenerated + */ + public Long getAttachId() { + return attachId; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column cont_attach_info.attach_id + * + * @param attachId the value for cont_attach_info.attach_id + * + * @mbggenerated + */ + public void setAttachId(Long attachId) { + this.attachId = attachId; + } +} \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/AttachementInfoMapper.java b/src/main/java/com/soft/line/mapper/AttachementInfoMapper.java new file mode 100644 index 0000000..48598a6 --- /dev/null +++ b/src/main/java/com/soft/line/mapper/AttachementInfoMapper.java @@ -0,0 +1,30 @@ +package com.soft.line.mapper; + +import com.soft.line.entity.AttachementInfo; +import java.util.List; + +public interface AttachementInfoMapper { + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table attachement_info + * + * @mbggenerated + */ + int insert(AttachementInfo record); + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table attachement_info + * + * @mbggenerated + */ + AttachementInfo selectByPrimaryKey(Long id); + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table attachement_info + * + * @mbggenerated + */ + List selectAll(); +} \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/AttachementInfoMapper.xml b/src/main/java/com/soft/line/mapper/AttachementInfoMapper.xml new file mode 100644 index 0000000..b79b830 --- /dev/null +++ b/src/main/java/com/soft/line/mapper/AttachementInfoMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + insert into `attachement_info` (`attachment_name`, `attachement_url`, `modify_person`, + `modify_time`) + values (#{attachmentName,jdbcType=VARCHAR}, #{attachementUrl,jdbcType=VARCHAR}, #{modifyPerson,jdbcType=VARCHAR}, + #{modifyTime,jdbcType=TIMESTAMP}) + + + + \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/CertAttachInfoMapper.java b/src/main/java/com/soft/line/mapper/CertAttachInfoMapper.java new file mode 100644 index 0000000..459026d --- /dev/null +++ b/src/main/java/com/soft/line/mapper/CertAttachInfoMapper.java @@ -0,0 +1,30 @@ +package com.soft.line.mapper; + +import com.soft.line.entity.CertAttachInfo; +import java.util.List; + +public interface CertAttachInfoMapper { + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table cert_attach_info + * + * @mbggenerated + */ + int insert(CertAttachInfo record); + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table cert_attach_info + * + * @mbggenerated + */ + CertAttachInfo selectByPrimaryKey(Long id); + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table cert_attach_info + * + * @mbggenerated + */ + List selectAll(); +} \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/CertAttachInfoMapper.xml b/src/main/java/com/soft/line/mapper/CertAttachInfoMapper.xml new file mode 100644 index 0000000..4b9c469 --- /dev/null +++ b/src/main/java/com/soft/line/mapper/CertAttachInfoMapper.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + insert into `cert_attach_info` (`cert_id`, `attach_id`) + values (#{certId,jdbcType=BIGINT}, #{attachId,jdbcType=BIGINT}) + + + + \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/ContAttachInfoMapper.java b/src/main/java/com/soft/line/mapper/ContAttachInfoMapper.java new file mode 100644 index 0000000..e6a3cd1 --- /dev/null +++ b/src/main/java/com/soft/line/mapper/ContAttachInfoMapper.java @@ -0,0 +1,30 @@ +package com.soft.line.mapper; + +import com.soft.line.entity.ContAttachInfo; +import java.util.List; + +public interface ContAttachInfoMapper { + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table cont_attach_info + * + * @mbggenerated + */ + int insert(ContAttachInfo record); + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table cont_attach_info + * + * @mbggenerated + */ + ContAttachInfo selectByPrimaryKey(Long id); + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table cont_attach_info + * + * @mbggenerated + */ + List selectAll(); +} \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/ContAttachInfoMapper.xml b/src/main/java/com/soft/line/mapper/ContAttachInfoMapper.xml new file mode 100644 index 0000000..44e87a3 --- /dev/null +++ b/src/main/java/com/soft/line/mapper/ContAttachInfoMapper.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + insert into `cont_attach_info` (`cont_id`, `attach_id`) + values (#{contId,jdbcType=BIGINT}, #{attachId,jdbcType=BIGINT}) + + + + \ No newline at end of file -- Gitee From de8140e9eda0292ad282e6cd5766b6b7e66a64f5 Mon Sep 17 00:00:00 2001 From: wuxueqiao <17625808004@163.com> Date: Mon, 18 May 2020 13:53:44 +0800 Subject: [PATCH 018/211] =?UTF-8?q?=E6=B7=BB=E5=8A=A0redis=EF=BC=8Ctoken?= =?UTF-8?q?=E7=99=BB=E5=BD=95=EF=BC=8Credis=E9=85=8D=E7=BD=AE=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E7=AD=89=20=E7=99=BB=E5=BD=95=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/soft/line/aop/Permission.java | 16 + .../com/soft/line/aop/PermissionAspect.java | 45 ++ .../soft/line/controller/LoginController.java | 22 +- .../java/com/soft/line/entity/UserInfo.java | 229 ++++++++++ .../com/soft/line/entity/UserInfoToken.java | 21 + .../soft/line/filter/ConfigurationFilter.java | 148 ++++++ .../GlobalApplicationContextHolder.java | 71 +++ .../java/com/soft/line/filter/GsonUtil.java | 18 + .../com/soft/line/filter/HttpRequestUtil.java | 52 +++ .../com/soft/line/filter/ResponseWrapper.java | 84 ++++ .../java/com/soft/line/filter/StatusCode.java | 63 +++ src/main/java/com/soft/line/filter/Token.java | 54 +++ .../com/soft/line/filter/UserTokenDto.java | 16 + .../com/soft/line/service/LoginService.java | 16 + .../soft/line/service/UserInfoService.java | 12 + .../line/service/impl/LoginServiceImpl.java | 72 +++ .../line/util/generator/mybatis-generator.xml | 8 +- .../soft/line/util/redis/JedisProperties.java | 71 +++ .../com/soft/line/util/redis/RedisClient.java | 420 ++++++++++++++++++ .../com/soft/line/util/redis/RedisConfig.java | 48 ++ src/main/resources/application.properties | 11 + 21 files changed, 1485 insertions(+), 12 deletions(-) create mode 100644 src/main/java/com/soft/line/aop/Permission.java create mode 100644 src/main/java/com/soft/line/aop/PermissionAspect.java create mode 100644 src/main/java/com/soft/line/entity/UserInfo.java create mode 100644 src/main/java/com/soft/line/entity/UserInfoToken.java create mode 100644 src/main/java/com/soft/line/filter/ConfigurationFilter.java create mode 100644 src/main/java/com/soft/line/filter/GlobalApplicationContextHolder.java create mode 100644 src/main/java/com/soft/line/filter/GsonUtil.java create mode 100644 src/main/java/com/soft/line/filter/HttpRequestUtil.java create mode 100644 src/main/java/com/soft/line/filter/ResponseWrapper.java create mode 100644 src/main/java/com/soft/line/filter/StatusCode.java create mode 100644 src/main/java/com/soft/line/filter/Token.java create mode 100644 src/main/java/com/soft/line/filter/UserTokenDto.java create mode 100644 src/main/java/com/soft/line/service/LoginService.java create mode 100644 src/main/java/com/soft/line/service/UserInfoService.java create mode 100644 src/main/java/com/soft/line/service/impl/LoginServiceImpl.java create mode 100644 src/main/java/com/soft/line/util/redis/JedisProperties.java create mode 100644 src/main/java/com/soft/line/util/redis/RedisClient.java create mode 100644 src/main/java/com/soft/line/util/redis/RedisConfig.java diff --git a/src/main/java/com/soft/line/aop/Permission.java b/src/main/java/com/soft/line/aop/Permission.java new file mode 100644 index 0000000..10aae27 --- /dev/null +++ b/src/main/java/com/soft/line/aop/Permission.java @@ -0,0 +1,16 @@ +package com.soft.line.aop; + +import lombok.extern.slf4j.Slf4j; + +import java.lang.annotation.*; + +/** + * @author wu.xueqiao on 2020/5/12. + * @version 0.1 + * @Description 定义用户访问权限 Permission + */ +@Target( ElementType.METHOD ) +@Retention( RetentionPolicy.RUNTIME ) +@Documented +public @interface Permission { +} diff --git a/src/main/java/com/soft/line/aop/PermissionAspect.java b/src/main/java/com/soft/line/aop/PermissionAspect.java new file mode 100644 index 0000000..ed484ed --- /dev/null +++ b/src/main/java/com/soft/line/aop/PermissionAspect.java @@ -0,0 +1,45 @@ +package com.soft.line.aop; + +import com.soft.line.entity.UserInfoToken; +import com.soft.line.filter.HttpRequestUtil; +import com.soft.line.filter.UserTokenDto; +import lombok.extern.slf4j.Slf4j; +import org.apache.coyote.Response; +import org.aspectj.lang.ProceedingJoinPoint; +import org.aspectj.lang.annotation.Around; +import org.aspectj.lang.annotation.Aspect; +import org.springframework.stereotype.Component; +import org.springframework.web.bind.annotation.ResponseBody; + +/** + * @author wu.xueqiao on 2020/5/12. + * @version 0.1 + */ + +@Aspect +@Slf4j +@Component +@ResponseBody +public class PermissionAspect { + + + + //环绕通知 + @Around(value="@annotation(permission)") + public void checkPermission(ProceedingJoinPoint joinPoint, Permission permission) throws Throwable{ + //获取请求session中的人员信息，判断人员所具有的权限，权限符合则继续，不符合则抛出相关提醒； + log.info("------开始校验权限------"); + //获取请求参数 + Object[] objects= joinPoint.getArgs(); + log.info("---"+objects[0]+"----"); + //获取请求客户端的个人信息 + UserTokenDto userToken=HttpRequestUtil.getUserToken(); + //根据角色,编辑业务逻辑。。。。。 + if(objects[0].equals("www")){ + + } + + + } + +} diff --git a/src/main/java/com/soft/line/controller/LoginController.java b/src/main/java/com/soft/line/controller/LoginController.java index bb0912f..f01b70b 100644 --- a/src/main/java/com/soft/line/controller/LoginController.java +++ b/src/main/java/com/soft/line/controller/LoginController.java @@ -1,25 +1,31 @@ package com.soft.line.controller; +import com.soft.line.entity.UserInfo; +import com.soft.line.service.LoginService; +import com.soft.line.service.UserInfoService; import com.soft.line.util.exception.ResultData; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletRequest; +import java.util.Map; + /** * @author wu.xueqiao on 2020/5/8. * @version 0.1 */ +@Slf4j @RestController @RequestMapping("/user") public class LoginController { + @Autowired + private LoginService loginService; - @PostMapping("/register") - public ResultData registerUserInfo(@RequestParam String username,@RequestParam String password){ - - ResultData resultData=new ResultData(); - - - return resultData; - + @PostMapping("/login") + public ResultData registerUserInfo(@RequestBody Map map){ + return loginService.userLogin(map); } } diff --git a/src/main/java/com/soft/line/entity/UserInfo.java b/src/main/java/com/soft/line/entity/UserInfo.java new file mode 100644 index 0000000..6267a2e --- /dev/null +++ b/src/main/java/com/soft/line/entity/UserInfo.java @@ -0,0 +1,229 @@ +package com.soft.line.entity; + +import java.util.Date; + +public class UserInfo { + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column user_info.id + * + * @mbggenerated + */ + private Long id; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column user_info.user_name + * + * @mbggenerated + */ + private String userName; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column user_info.password + * + * @mbggenerated + */ + private String password; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column user_info.phone + * + * @mbggenerated + */ + private String phone; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column user_info.privilege + * + * @mbggenerated + */ + private Integer privilege; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column user_info.modify_person + * + * @mbggenerated + */ + private String modifyPerson; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column user_info.modify_time + * + * @mbggenerated + */ + private Date modifyTime; + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column user_info.id + * + * @return the value of user_info.id + * + * @mbggenerated + */ + public Long getId() { + return id; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column user_info.id + * + * @param id the value for user_info.id + * + * @mbggenerated + */ + public void setId(Long id) { + this.id = id; + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column user_info.user_name + * + * @return the value of user_info.user_name + * + * @mbggenerated + */ + public String getUserName() { + return userName; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column user_info.user_name + * + * @param userName the value for user_info.user_name + * + * @mbggenerated + */ + public void setUserName(String userName) { + this.userName = userName == null ? null : userName.trim(); + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column user_info.password + * + * @return the value of user_info.password + * + * @mbggenerated + */ + public String getPassword() { + return password; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column user_info.password + * + * @param password the value for user_info.password + * + * @mbggenerated + */ + public void setPassword(String password) { + this.password = password == null ? null : password.trim(); + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column user_info.phone + * + * @return the value of user_info.phone + * + * @mbggenerated + */ + public String getPhone() { + return phone; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column user_info.phone + * + * @param phone the value for user_info.phone + * + * @mbggenerated + */ + public void setPhone(String phone) { + this.phone = phone == null ? null : phone.trim(); + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column user_info.privilege + * + * @return the value of user_info.privilege + * + * @mbggenerated + */ + public Integer getPrivilege() { + return privilege; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column user_info.privilege + * + * @param privilege the value for user_info.privilege + * + * @mbggenerated + */ + public void setPrivilege(Integer privilege) { + this.privilege = privilege; + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column user_info.modify_person + * + * @return the value of user_info.modify_person + * + * @mbggenerated + */ + public String getModifyPerson() { + return modifyPerson; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column user_info.modify_person + * + * @param modifyPerson the value for user_info.modify_person + * + * @mbggenerated + */ + public void setModifyPerson(String modifyPerson) { + this.modifyPerson = modifyPerson == null ? null : modifyPerson.trim(); + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column user_info.modify_time + * + * @return the value of user_info.modify_time + * + * @mbggenerated + */ + public Date getModifyTime() { + return modifyTime; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column user_info.modify_time + * + * @param modifyTime the value for user_info.modify_time + * + * @mbggenerated + */ + public void setModifyTime(Date modifyTime) { + this.modifyTime = modifyTime; + } +} \ No newline at end of file diff --git a/src/main/java/com/soft/line/entity/UserInfoToken.java b/src/main/java/com/soft/line/entity/UserInfoToken.java new file mode 100644 index 0000000..e74eec7 --- /dev/null +++ b/src/main/java/com/soft/line/entity/UserInfoToken.java @@ -0,0 +1,21 @@ +package com.soft.line.entity; + +import lombok.Data; + +/** + * @author wu.xueqiao on 2020/5/12. + * @version 0.1 + */ +@Data +public class UserInfoToken { + + private Integer userId; + private String userName; + private String account; + private String accountApp; + private String empCode; + private Integer orgId; + private String orgName; + private String token; + +} diff --git a/src/main/java/com/soft/line/filter/ConfigurationFilter.java b/src/main/java/com/soft/line/filter/ConfigurationFilter.java new file mode 100644 index 0000000..5036bdc --- /dev/null +++ b/src/main/java/com/soft/line/filter/ConfigurationFilter.java @@ -0,0 +1,148 @@ +package com.soft.line.filter; + +import com.google.gson.Gson; +import org.apache.catalina.filters.RemoteIpFilter; +import org.springframework.boot.web.servlet.FilterRegistrationBean; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.http.converter.HttpMessageConverter; +import org.springframework.http.converter.StringHttpMessageConverter; + +import javax.servlet.*; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.nio.charset.Charset; + + +/** + * @author wu.xueqiao on 2020/5/12. + * @version 0.1 + */ +@Configuration +public class ConfigurationFilter { + @Bean + public HttpMessageConverter responseBodyConverter() { + StringHttpMessageConverter converter = new StringHttpMessageConverter( + Charset.forName("UTF-8")); + return converter; + } + + @Bean + public RemoteIpFilter remoteIpFilter() { + return new RemoteIpFilter(); + } + + @Bean + public FilterRegistrationBean testFilterRegistration() { + FilterRegistrationBean registration = new FilterRegistrationBean(); + registration.setFilter(new MyFilter()); + registration.addUrlPatterns("/*"); + registration.addInitParameter("name", "value"); + registration.setName("MyFilter"); + registration.setOrder(1); + return registration; + } + + public class MyFilter implements Filter { + @Override + public void destroy() { + } + + @Override + public void doFilter(final ServletRequest servletRequest, final ServletResponse servletResponse, + final FilterChain chain) + throws IOException, ServletException { + + final Gson gson = new Gson(); + //final ResultData rd = new ResultData(); + final ResponseWrapper responseWrapper=new ResponseWrapper(); + final HttpServletRequest request = (HttpServletRequest) servletRequest; + final HttpServletResponse response = (HttpServletResponse) servletResponse; + response.setHeader("Access-Control-Allow-Origin", "*"); + response.setHeader("Access-Control-Allow-Methods", "POST,GET,PUT,OPTIONS,DELETE"); + response.setHeader("Access-Control-Max-Age", "3600"); + response.setHeader("Access-Control-Allow-Headers", "Origin,X-Requested-With,Content-Type,Accept,Authorization,token"); + final String uri = request.getRequestURI(); + String auth = request.getHeader("Authorization"); + Token token = null; + if (!uri.contains("/login")) { + if (auth == null || "".equals(auth)) { + if (uri.contains("/file/download/")) { + auth = request.getParameter("token"); + if (auth == null || "".equals(auth)) { + response.setContentType("application/json"); + response.setCharacterEncoding("UTF-8"); + //rd.setMsg("Authentication Failed: Require Authorization"); + responseWrapper.failure(StatusCode.SC_10000.val(),"Authentication Failed: Require Authorization"); + //rd.setStatus("10000"); + final String write = gson.toJson(responseWrapper); + response.getWriter().write(write); + return; + } + } else { + response.setContentType("application/json"); + response.setCharacterEncoding("UTF-8"); + //rd.setMsg("Authentication Failed: Require Authorization"); + responseWrapper.failure(StatusCode.SC_10000.val(),"Authentication Failed: Require Authorization"); + //rd.setStatus("10000"); + final String write = gson.toJson(responseWrapper); + response.getWriter().write(write); + return; + } + } + token = new Token(auth); + if (token.getErr() == Token.ExpiredJwtError) { + response.setContentType("application/json"); + response.setCharacterEncoding("UTF-8"); + //rd.setMsg("Authentication Failed: 认证过期"); + responseWrapper.failure(StatusCode.SC_10001.val(),"Authentication Failed: 认证过期"); + // rd.setStatus("10000"); + final String write = gson.toJson(responseWrapper); + response.getWriter().write(write); + return; + } + if (token.getErr() == Token.SignatureError) { + response.setContentType("application/json"); + response.setCharacterEncoding("UTF-8"); + //rd.setMsg("Authentication Failed: 非法认证"); + responseWrapper.failure(StatusCode.SC_10002.val(),"Authentication Failed: 非法认证"); + + //rd.setStatus("10000"); + final String write = gson.toJson(responseWrapper); + response.getWriter().write(write); + return; + } + if (HttpRequestUtil.REDIS_SERVICE.getKeyValue(token.getUsername()) == null + || "".equals(HttpRequestUtil.REDIS_SERVICE.getKeyValue(token.getUsername()))) { + response.setContentType("application/json"); + response.setCharacterEncoding("UTF-8"); + //rd.setMsg("会话过期，请重新登录"); + responseWrapper.failure(StatusCode.SC_10003.val(),"会话过期，请重新登录"); + //rd.setStatus("10000"); + final String write = gson.toJson(responseWrapper); + response.getWriter().write(write); + return; + } + HttpRequestUtil.REDIS_SERVICE.setKeyTimeout(token.getUsername(), HttpRequestUtil.expire); + } + try { + chain.doFilter(request, response); + } catch (final Exception e) { + System.out.println(e.toString()); + response.setContentType("application/json"); + response.setCharacterEncoding("UTF-8"); + //rd.setMsg("服务器异常"); + responseWrapper.failure(StatusCode.SC_500.val(),"请求失败"); + //rd.setStatus("10001"); + final String write = gson.toJson(responseWrapper); + response.getWriter().write(write); + return; + } + } + + @Override + public void init(FilterConfig arg0) throws ServletException { + } + } +} \ No newline at end of file diff --git a/src/main/java/com/soft/line/filter/GlobalApplicationContextHolder.java b/src/main/java/com/soft/line/filter/GlobalApplicationContextHolder.java new file mode 100644 index 0000000..b855667 --- /dev/null +++ b/src/main/java/com/soft/line/filter/GlobalApplicationContextHolder.java @@ -0,0 +1,71 @@ +package com.soft.line.filter; + +import org.springframework.context.ApplicationContext; +import org.springframework.context.ApplicationContextAware; +import org.springframework.stereotype.Component; + +import java.util.Map; + +@Component +public class GlobalApplicationContextHolder implements ApplicationContextAware { + + private static ApplicationContext context; + + /** + *

because the ApplicationContextAware interface is implemented,

+ *

when it is configured as bean, it will automatically injecting ApplicationContext.

+ */ + @Override + public void setApplicationContext(final ApplicationContext applicationContext) { + setAppContext(applicationContext); + } + + /** + * provide a static method for setting up ApplicationContext. + * + * @param applicationContext + */ + public static void setAppContext(final ApplicationContext applicationContext) { + context = applicationContext; + } + + /** + * static method to obtain ApplicationContext + * + * @return + */ + public static ApplicationContext getApplicationContext() { + return context; + } + + /** + * get bean based on the bean name. + * + * @param name + * + * @return + */ + public static Object getBean(final String name) { + return getApplicationContext().getBean(name); + } + + /** + * get bean (generic) according to Class. + * + * @param clazz + * @return + */ + public static T getBean(final Class clazz) { + return getApplicationContext().getBean(clazz); + } + + /** + * get all the bean to implement an interface based on Class. + * + * @param clazz + * @return + */ + public static Map getBeansOfType(final Class clazz) { + return getApplicationContext().getBeansOfType(clazz); + } +} diff --git a/src/main/java/com/soft/line/filter/GsonUtil.java b/src/main/java/com/soft/line/filter/GsonUtil.java new file mode 100644 index 0000000..0c1b8db --- /dev/null +++ b/src/main/java/com/soft/line/filter/GsonUtil.java @@ -0,0 +1,18 @@ +package com.soft.line.filter; + +import com.google.gson.Gson; + + +public class GsonUtil { + public static String javabeanToJson(final UserTokenDto user) { + final Gson gson = new Gson(); + final String json = gson.toJson(user); + return json; + } + + public static UserTokenDto jsonToJavaBean(final String json) { + final Gson gson = new Gson(); + final UserTokenDto user = gson.fromJson(json, UserTokenDto.class); + return user; + } +} diff --git a/src/main/java/com/soft/line/filter/HttpRequestUtil.java b/src/main/java/com/soft/line/filter/HttpRequestUtil.java new file mode 100644 index 0000000..5a8d1b4 --- /dev/null +++ b/src/main/java/com/soft/line/filter/HttpRequestUtil.java @@ -0,0 +1,52 @@ +package com.soft.line.filter; + + +import com.soft.line.util.redis.RedisClient; +import org.springframework.web.context.request.RequestAttributes; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; + +import javax.servlet.http.HttpServletRequest; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.Map; + + +public class HttpRequestUtil { + public static final RedisClient REDIS_SERVICE = (RedisClient) GlobalApplicationContextHolder.getApplicationContext() + .getBean("redisClient"); + + + public static final String key = "SOFTLINE-BUILD"; + + public static final Integer expire = 315360000; + + public static UserTokenDto getUserToken() { + + final RequestAttributes ra = RequestContextHolder.getRequestAttributes(); + final ServletRequestAttributes sra = (ServletRequestAttributes) ra; + final HttpServletRequest request = sra.getRequest(); + final Map map = getHeadersInfo(request); + String token = map.get("authorization"); + if (token == null || "".equals(token)) { + token = request.getParameter("token"); + } + final Token tokenInfo = new Token(token); + String json = null; + + json = REDIS_SERVICE.getKeyValue(tokenInfo.getUsername()); + + return GsonUtil.jsonToJavaBean(json); + } + + private static Map getHeadersInfo(final HttpServletRequest request) { + final Map map = new HashMap(); + final Enumeration headerNames = request.getHeaderNames(); + while (headerNames.hasMoreElements()) { + final String key = headerNames.nextElement(); + final String value = request.getHeader(key); + map.put(key, value); + } + return map; + } +} diff --git a/src/main/java/com/soft/line/filter/ResponseWrapper.java b/src/main/java/com/soft/line/filter/ResponseWrapper.java new file mode 100644 index 0000000..e3ca08d --- /dev/null +++ b/src/main/java/com/soft/line/filter/ResponseWrapper.java @@ -0,0 +1,84 @@ +package com.soft.line.filter; + + + +import java.io.Serializable; +import java.util.HashMap; +import java.util.Map; + + +public class ResponseWrapper implements Serializable { + + private static final String OK = "OK"; + private static final String ERROR = "Error"; + private static final String BOOL_RES_KEY = "result"; + private ResponseWrapper.Meta meta; + private Object data; + + public ResponseWrapper() { + } + + public ResponseWrapper success(String code) { + return this.success(code, new HashMap(0)); + } + + public ResponseWrapper success(String code, Object data) { + this.meta = new ResponseWrapper.Meta(code, "OK"); + this.data = data != null ? data : new HashMap(0); + return this; + } + + public static ResponseWrapper successRespForBool(boolean result) { + ResponseWrapper dr = new ResponseWrapper(); + Map res = new HashMap(); + res.put("result", result); + dr.success(StatusCode.SC_200.val(), res); + return dr; + } + + public static ResponseWrapper successRespForVoid() { + ResponseWrapper dr = new ResponseWrapper(); + dr.success(StatusCode.SC_200.val()); + return dr; + } + + public ResponseWrapper failure(String code) { + return this.failure(code, "Error"); + } + + public ResponseWrapper failure(String code, String message) { + this.meta = new ResponseWrapper.Meta(code, message); + this.data = new HashMap(0); + return this; + } + + public ResponseWrapper.Meta getMeta() { + return this.meta; + } + + public Object getData() { + return this.data; + } + + public static class Meta implements Serializable { + private String code; + private String message; + + public Meta(String code) { + this(code, ""); + } + + public Meta(String code, String message) { + this.code = code; + this.message = message; + } + + public String getCode() { + return this.code; + } + + public String getMessage() { + return this.message; + } + } +} diff --git a/src/main/java/com/soft/line/filter/StatusCode.java b/src/main/java/com/soft/line/filter/StatusCode.java new file mode 100644 index 0000000..afad865 --- /dev/null +++ b/src/main/java/com/soft/line/filter/StatusCode.java @@ -0,0 +1,63 @@ +package com.soft.line.filter; + +public enum StatusCode { + + SC_200("SC_200"), + SC_201("SC_201"), + SC_400("SC_400"), + SC_401("SC_401"), + SC_404("SC_404"), + SC_405("SC_405"), + SC_422("SC_422"), + SC_500("SC_500"), + SC_10000("SC_10000"), + SC_10001("SC_10001"), + SC_10002("SC_10002"), + SC_10004("SC_10004"), + SC_10003("SC_10003"); + + + + private String code; + + private StatusCode(String code) { + this.code = code; + } + + public String val() { + return this.code; + } + + public static StatusCode valueOf(int code) { + switch (code) { + case 200: + return SC_200; + case 201: + return SC_201; + case 400: + return SC_400; + case 401: + return SC_401; + case 404: + return SC_404; + case 405: + return SC_405; + case 422: + return SC_422; + case 500: + return SC_500; + case 10000: + return SC_10000; + case 10001: + return SC_10001; + case 10002: + return SC_10002; + case 10003: + return SC_10003; + case 10004: + return SC_10004; + default: + return SC_500; + } + } +} diff --git a/src/main/java/com/soft/line/filter/Token.java b/src/main/java/com/soft/line/filter/Token.java new file mode 100644 index 0000000..90ba033 --- /dev/null +++ b/src/main/java/com/soft/line/filter/Token.java @@ -0,0 +1,54 @@ +package com.soft.line.filter; + +import io.jsonwebtoken.*; +/** + * @author wu.xueqiao on 2020/5/12. + * @version 0.1 + */ +public class Token { + + private String account; + + private String username; + + + + private int err = 0; + + public static final int ExpiredJwtError = 1; + + public static final int SignatureError = 2; + + public Token(final String token) { + try { + JwtParser jwtParser = Jwts.parser().setSigningKey(HttpRequestUtil.key); + Jws claimsJws = jwtParser.parseClaimsJws(token); + Claims body = claimsJws.getBody(); + final Claims claims = Jwts.parser().setSigningKey(HttpRequestUtil.key).parseClaimsJws(token).getBody(); + + this.username = claims.get("username").toString(); + } catch (final ExpiredJwtException e) { + this.err = ExpiredJwtError; + } catch (final SignatureException e) { + this.err = SignatureError; + } + } + + public String getAccount() { + + return account; + } + + + public String getUsername() { + + return username; + } + + + public int getErr() { + + return err; + } + +} diff --git a/src/main/java/com/soft/line/filter/UserTokenDto.java b/src/main/java/com/soft/line/filter/UserTokenDto.java new file mode 100644 index 0000000..4b26dd4 --- /dev/null +++ b/src/main/java/com/soft/line/filter/UserTokenDto.java @@ -0,0 +1,16 @@ +package com.soft.line.filter; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; +import java.util.Map; + +@Data +public class UserTokenDto implements Serializable { + private String userName; + private String password; + + private String token; + +} diff --git a/src/main/java/com/soft/line/service/LoginService.java b/src/main/java/com/soft/line/service/LoginService.java new file mode 100644 index 0000000..36b7cf4 --- /dev/null +++ b/src/main/java/com/soft/line/service/LoginService.java @@ -0,0 +1,16 @@ +package com.soft.line.service; + +import com.soft.line.entity.UserInfo; +import com.soft.line.util.exception.ResultData; + +import java.util.Map; + +/** + * @author wu.xueqiao on 2020/5/12. + * @version 0.1 + */ +public interface LoginService { + + public ResultData userLogin(Map map); + +} diff --git a/src/main/java/com/soft/line/service/UserInfoService.java b/src/main/java/com/soft/line/service/UserInfoService.java new file mode 100644 index 0000000..4eb44a8 --- /dev/null +++ b/src/main/java/com/soft/line/service/UserInfoService.java @@ -0,0 +1,12 @@ +package com.soft.line.service; + +import com.soft.line.entity.UserInfo; + +/** + * @author wu.xueqiao on 2020/5/12. + * @version 0.1 + */ +public interface UserInfoService { + + public UserInfo getUserInfo(int userId); +} diff --git a/src/main/java/com/soft/line/service/impl/LoginServiceImpl.java b/src/main/java/com/soft/line/service/impl/LoginServiceImpl.java new file mode 100644 index 0000000..6b95897 --- /dev/null +++ b/src/main/java/com/soft/line/service/impl/LoginServiceImpl.java @@ -0,0 +1,72 @@ +package com.soft.line.service.impl; + +import com.soft.line.entity.UserInfo; +import com.soft.line.filter.GsonUtil; +import com.soft.line.filter.HttpRequestUtil; +import com.soft.line.filter.UserTokenDto; +import com.soft.line.mapper.UserInfoMapper; +import com.soft.line.service.LoginService; +import com.soft.line.util.exception.ResultData; +import com.soft.line.util.redis.RedisClient; +import io.jsonwebtoken.Jwts; +import io.jsonwebtoken.SignatureAlgorithm; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; + +/** + * @author wu.xueqiao on 2020/5/12. + * @version 0.1 + */ +@Slf4j +@Service +public class LoginServiceImpl implements LoginService { + + @Autowired + private UserInfoMapper userInfoMapper; + @Resource + private RedisClient redisClient; + @Override + public ResultData userLogin(Map map) { + + UserInfo userInfo= userInfoMapper.userLogin(map); + if(userInfo!=null){ + UserTokenDto user=new UserTokenDto(); + user.setUserName(userInfo.getUserName()); + user.setPassword(userInfo.getPassword()); + String token=returnToken(user); + user.setToken(token); + if (token == null || "".equals(token)) { + return new ResultData("0", "redis插入失败", null); + } + return new ResultData("1", "登录成功", user); + }else{ + return new ResultData("201","登录失败！",null); + } + } + + + public String returnToken(final UserTokenDto user) { + if (redisClient.getKeyValue(user.getUserName()) == null || "".equals(redisClient.getKeyValue(user.getUserName()))) { + final Map claims = new HashMap(); + claims.put("password", user.getPassword()); + claims.put("username", user.getUserName()); + claims.put("uuid", UUID.randomUUID().toString()); + final String token = Jwts.builder().setClaims(claims) + .signWith(SignatureAlgorithm.HS512, HttpRequestUtil.key).compact(); + user.setToken(token); + if (!redisClient.setKeyValue(user.getUserName(), GsonUtil.javabeanToJson(user),HttpRequestUtil.expire)) { + return null; + } + return token; + } else { + redisClient.setKeyTimeout(user.getUserName(), HttpRequestUtil.expire); + return GsonUtil.jsonToJavaBean(redisClient.getKeyValue(user.getUserName())).getToken(); + } + } +} diff --git a/src/main/java/com/soft/line/util/generator/mybatis-generator.xml b/src/main/java/com/soft/line/util/generator/mybatis-generator.xml index 49e1003..a8de097 100644 --- a/src/main/java/com/soft/line/util/generator/mybatis-generator.xml +++ b/src/main/java/com/soft/line/util/generator/mybatis-generator.xml @@ -31,20 +31,20 @@ + targetProject="C:\Users\DELL\Desktop\0423\softline-files-manage\src\main\java"> + targetProject="C:\Users\DELL\Desktop\0423\softline-files-manage\src\main\java"> @@ -77,7 +77,7 @@ delimitAllColumns="true"> --> - 0L; + + } catch (final Exception e) { + } finally { + if (jedis != null) { + jedis.close(); + } + } + return false; + } + + /** + * an ordered set of values (in terms of fractions). + * @param key + * @param score + * + * @return object + */ + public Object getSorted(final String key, final Integer score) { + + final ShardedJedis jedis = getJedis(); + try { + final Set memberSet = jedis.zrevrange(key, 0, score); + return memberSet; + } catch (final Exception e) { + } finally { + if (jedis != null) { + jedis.close(); + } + } + return null; + } + + /** + * increase acquisition of correlation key words by ordered set. + * @param key + * @param fuzzy + * @param size + * + * @return object + */ + public Object getMatchMember(final String key, final String fuzzy, final int size) { + final ShardedJedis jedis = getJedis(); + try { + + final ScanParams scanParams = new ScanParams(); + scanParams.count(size); + scanParams.match("*" + fuzzy + "*"); + final ScanResult memberSet = jedis.zscan(key, "", scanParams); + return memberSet; + } catch (final Exception e) { + } finally { + if (jedis != null) { + jedis.close(); + } + } + return null; + + } + + /** + * increase the score of an ordered set of a certain value. + * @param key + * @param score + * @param member + * + * @return boolean + */ + public boolean incrbySocre(final String key, final Integer score, final String member) { + final ShardedJedis jedis = getJedis(); + try { + return jedis.zincrby(key, score, member) > 0l; + + } catch (final Exception e) { + } finally { + if (jedis != null) { + jedis.close(); + } + } + return false; + } + + /** + * add key value pairs in the specified domain + * @param value + * @param key + * @param field + * + * @return boolean + */ + public boolean set(final Object value, final String key, final String field) { + + final ShardedJedis jedis = getJedis(); + try { + return jedis.hset(key, field, value.toString()) > 0l; + } catch (final JedisException e) { + logger.error(e.getMessage()); + } finally { + if (jedis != null) { + jedis.close(); + } + } + return false; + } + + public boolean delList(final String key) { + final ShardedJedis jedis = getJedis(); + try { + return jedis.del(key.getBytes()) > 0l; + } catch (final JedisException e) { + logger.error(e.getMessage()); + } finally { + if (jedis != null) { + jedis.close(); + } + } + return false; + } + + public boolean del(final String key) { + final ShardedJedis jedis = getJedis(); + try { + return jedis.del(key) > 0l; + } catch (final JedisException e) { + logger.error(e.getMessage()); + } finally { + if (jedis != null) { + jedis.close(); + } + } + return false; + } + + public void dels(final String key) { + final Jedis jedis = jgetJedis(); + try { +// Set set = jedis.keys(key+"*"); +// for (String akey : set) { +// jedis.del(akey); +// } + jedis.select(8); + Set set = jedis.keys(key+":*"); + for (String akey : set) { + jedis.del(akey); + } + } catch (final JedisException e) { + logger.error(e.getMessage()); + } finally { + if (jedis != null) { + jedis.close(); + } + } + } + + public boolean listSet(final String key, final List value) { + final ShardedJedis jedis = getJedis(); + try { + for (final String code : value) { + jedis.rpush(key.getBytes(), code.getBytes()); + } + return true; + } catch (final JedisException e) { + logger.error(e.getMessage()); + } finally { + if (jedis != null) { + jedis.close(); + } + } + return false; + } + + public List hasApp(final String key) { + final ShardedJedis jedis = getJedis(); + try { + return jedis.lrange(key, 0, -1); + } catch (final JedisException e) { + logger.error(e.getMessage()); + } finally { + if (jedis != null) { + jedis.close(); + } + } + return null; + } + + /** + * get the value of the corresponding key in the specified domain. + * @param key + * @param field + * + * @return Object + */ + public Object get(final String key, final String field) { + + final ShardedJedis jedis = getJedis(); + try { + + if (jedis.hget(key, field) == null) { + return null; + } + final Object value = jedis.hget(key, field); + return value.toString(); + } catch (final JedisException e) { + logger.error(e.getMessage()); + return null; + } finally { + if (jedis != null) { + jedis.close(); + } + } + } + + /** + * delete key value pairs in the specified key name hash table. + * @param key + * @param field + * + * @return boolean + */ + public boolean del(final String key, final String field) { + + final ShardedJedis jedis = getJedis(); + try { + return jedis.hdel(key, field) > 0; + } catch (final JedisException e) { + logger.error(e.getMessage()); + } finally { + if (jedis != null) { + jedis.close(); + } + } + return false; + } + + /** + * delete all key value pairs in the specified key key + * @param key + * + * @return boolean + */ + public boolean mdel(final String key) { + + final ShardedJedis jedis = getJedis(); + try { + final List keys = scan(key); + if (keys != null) { + for (final String k : keys) { + del(key, k); + } + return true; + } else { + return false; + } + } catch (final JedisException e) { + logger.error(e.getMessage()); + } finally { + if (jedis != null) { + jedis.close(); + } + } + return false; + } + + /** + * Get all keys in the specified key name hash table. + * @param key + * + * @return List + */ + public List scan(final String key) { + + final ShardedJedis jedis = getJedis(); + try { + final List list = new ArrayList(); + list.addAll(jedis.hkeys(key)); + return list; + } catch (final JedisException e) { + logger.error(e.getMessage()); + } finally { + if (jedis != null) { + jedis.close(); + } + } + return null; + } + + /** + * set value by key、value、seconds + * + * @param key + * @param value + * @param seconds + */ + public Boolean setKeyValue(final String key, final String value, final Integer seconds) { + + final ShardedJedis jedis = getJedis(); + try { + String tt = jedis.set(key, value); + if ("OK".equals(jedis.set(key, value))) { + jedis.expire(key, seconds); + return true; + } + } catch (final JedisException e) { + logger.error(e.getMessage()); + } finally { + if (jedis != null) { + jedis.close(); + } + } + return false; + } + + /** + * get value by key + * + * @param key + */ + public String getKeyValue(final String key) { + + final ShardedJedis jedis = getJedis(); + try { + return jedis.get(key); + } catch (final JedisException e) { + logger.error(e.getMessage()); + } finally { + if (jedis != null) { + jedis.close(); + } + } + return null; + } + + /** + * set outTime + * + * @param key + * @param seconds + */ + public Boolean setKeyTimeout(final String key, final Integer seconds) { + + final ShardedJedis jedis = getJedis(); + try { + return jedis.expire(key, seconds) == 1L; + } catch (final JedisException e) { + logger.error(e.getMessage()); + } finally { + if (jedis != null) { + jedis.close(); + } + } + return false; + } +} diff --git a/src/main/java/com/soft/line/util/redis/RedisConfig.java b/src/main/java/com/soft/line/util/redis/RedisConfig.java new file mode 100644 index 0000000..9b62f82 --- /dev/null +++ b/src/main/java/com/soft/line/util/redis/RedisConfig.java @@ -0,0 +1,48 @@ +package com.soft.line.util.redis; + + +import com.soft.line.util.redis.JedisProperties; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; +import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import redis.clients.jedis.JedisPoolConfig; +import redis.clients.jedis.JedisShardInfo; +import redis.clients.jedis.ShardedJedisPool; + +import java.util.ArrayList; +import java.util.List; + + +@Configuration +@EnableAutoConfiguration +@EnableConfigurationProperties(JedisProperties.class) +@ConditionalOnClass(RedisClient.class) +public class RedisConfig { + @Autowired + private JedisProperties prop; + + @Bean(name="shardedJedisPool") + public ShardedJedisPool shardedJedisPool() { + JedisPoolConfig config = new JedisPoolConfig(); + config.setMaxTotal(prop.getMaxTotal()); + config.setMaxIdle(prop.getMaxIdle()); + config.setMaxWaitMillis(prop.getMaxWaitMillis()); + List jedisShardInfoList = new ArrayList<>(); + jedisShardInfoList.add(new JedisShardInfo(prop.getUri())); + ShardedJedisPool shardedJedisPool = new ShardedJedisPool(config, jedisShardInfoList); + return shardedJedisPool; + } + + @Bean + @ConditionalOnMissingBean(RedisClient.class) + public RedisClient redisClient(@Qualifier("shardedJedisPool")ShardedJedisPool shardedJedisPool) { + RedisClient redisClient = new RedisClient(); + redisClient.setShardedJedisPool(shardedJedisPool); + return redisClient; + } +} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index ac4093a..29285bc 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -4,6 +4,7 @@ spring.datasource.url= jdbc:mysql://localhost:3306/rz_archives spring.datasource.username=root spring.datasource.password=root spring.datasource.driver-class-name=com.mysql.jdbc.Driver +#ݿӳ spring.datasource.type=com.alibaba.druid.pool.DruidDataSource spring.datasource.druid.initialSize=5 spring.datasource.druid.minIdle=5 @@ -21,6 +22,16 @@ spring.datasource.druid.maxPoolPreparedStatementPerConnectionSize=20 spring.datasource.druid.useGlobalDataSourceStat=true spring.datasource.druid.connectionProperties=druid.stat.mergeSql=true;druid.stat.slowSqlMillis=500 +#redisӵַ +spring.jedis.host = 127.0.0.1 +spring.jedis.port = 6379 +spring.jedis.uri=redis://127.0.0.1:6379/11 +spring.jedis.maxTotal=100 +spring.jedis.maxIdle= 10 +spring.jedis.maxWaitMillis =100000 + +#mybatis log +logging.level.com.soft.line.mapper = debug #mybatisӳļ· #mybatis.mapper-locations=com.soft.line.mapper/*.xml -- Gitee From fcebd056c2577772244e1af434c597614bcccaca Mon Sep 17 00:00:00 2001 From: wuxueqiao <17625808004@163.com> Date: Mon, 18 May 2020 14:00:25 +0800 Subject: [PATCH 019/211] =?UTF-8?q?=E7=99=BB=E5=BD=95=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/soft/line/mapper/UserInfoMapper.java | 36 ++++++++++++ .../com/soft/line/mapper/UserInfoMapper.xml | 55 +++++++++++++++++++ .../service/impl/UserInfoServiceImpl.java | 22 ++++++++ 3 files changed, 113 insertions(+) create mode 100644 src/main/java/com/soft/line/mapper/UserInfoMapper.java create mode 100644 src/main/java/com/soft/line/mapper/UserInfoMapper.xml create mode 100644 src/main/java/com/soft/line/service/impl/UserInfoServiceImpl.java diff --git a/src/main/java/com/soft/line/mapper/UserInfoMapper.java b/src/main/java/com/soft/line/mapper/UserInfoMapper.java new file mode 100644 index 0000000..8fa879e --- /dev/null +++ b/src/main/java/com/soft/line/mapper/UserInfoMapper.java @@ -0,0 +1,36 @@ +package com.soft.line.mapper; + +import com.soft.line.entity.UserInfo; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; +import java.util.Map; + +@Mapper +public interface UserInfoMapper { + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table user_info + * + * @mbggenerated + */ + int insert(UserInfo record); + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table user_info + * + * @mbggenerated + */ + UserInfo selectByPrimaryKey(Integer id); + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table user_info + * + * @mbggenerated + */ + List selectAll(); + + UserInfo userLogin(Map map); +} \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/UserInfoMapper.xml b/src/main/java/com/soft/line/mapper/UserInfoMapper.xml new file mode 100644 index 0000000..e17e725 --- /dev/null +++ b/src/main/java/com/soft/line/mapper/UserInfoMapper.xml @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + insert into `user_info` (`user_name`, `password`, `phone`, + `privilege`, `modify_person`, `modify_time` + ) + values (#{userName,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR}, #{phone,jdbcType=VARCHAR}, + #{privilege,jdbcType=INTEGER}, #{modifyPerson,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP} + ) + + + + + + \ No newline at end of file diff --git a/src/main/java/com/soft/line/service/impl/UserInfoServiceImpl.java b/src/main/java/com/soft/line/service/impl/UserInfoServiceImpl.java new file mode 100644 index 0000000..69f303b --- /dev/null +++ b/src/main/java/com/soft/line/service/impl/UserInfoServiceImpl.java @@ -0,0 +1,22 @@ +package com.soft.line.service.impl; + +import com.soft.line.entity.UserInfo; +import com.soft.line.mapper.UserInfoMapper; +import com.soft.line.service.UserInfoService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +/** + * @author wu.xueqiao on 2020/5/12. + * @version 0.1 + */ +@Service +public class UserInfoServiceImpl implements UserInfoService { + + @Autowired + private UserInfoMapper userInfoMapper; + @Override + public UserInfo getUserInfo(int userId) { + return userInfoMapper.selectByPrimaryKey(userId); + } +} -- Gitee From 7e6b6895e01c4a0c458e7866270b76833a82cbc4 Mon Sep 17 00:00:00 2001 From: ljc <1119265069@qq.com> Date: Thu, 21 May 2020 00:52:59 +0800 Subject: [PATCH 020/211] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=8F=9C=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CertificateInfoController.java | 20 +- .../soft/line/controller/MenuController.java | 45 +++ .../com/soft/line/entity/AttachementInfo.java | 9 +- .../com/soft/line/entity/CertAttachInfo.java | 18 +- .../com/soft/line/entity/CertificateInfo.java | 6 +- .../com/soft/line/entity/ContAttachInfo.java | 18 +- .../com/soft/line/entity/MenuButtonInfo.java | 165 ++++++++ .../java/com/soft/line/entity/MenuInfo.java | 293 ++++++++++++++ .../java/com/soft/line/entity/RoleInfo.java | 67 ++++ .../java/com/soft/line/entity/RoleMenu.java | 197 ++++++++++ .../java/com/soft/line/entity/UserInfo.java | 357 ++++++++++++++++++ .../line/mapper/AttachementInfoMapper.java | 2 +- .../line/mapper/AttachementInfoMapper.xml | 26 +- .../line/mapper/CertAttachInfoMapper.java | 2 +- .../soft/line/mapper/CertAttachInfoMapper.xml | 24 +- .../line/mapper/CertificateInfoMapper.java | 4 +- .../line/mapper/CertificateInfoMapper.xml | 24 +- .../soft/line/mapper/CodeDetailMapper.java | 15 +- .../com/soft/line/mapper/CodeDetailMapper.xml | 28 +- .../line/mapper/ContAttachInfoMapper.java | 2 +- .../soft/line/mapper/ContAttachInfoMapper.xml | 24 +- .../line/mapper/MenuButtonInfoMapper.java | 32 ++ .../soft/line/mapper/MenuButtonInfoMapper.xml | 35 ++ .../com/soft/line/mapper/MenuInfoMapper.java | 32 ++ .../com/soft/line/mapper/MenuInfoMapper.xml | 40 ++ .../com/soft/line/mapper/RoleInfoMapper.java | 30 ++ .../com/soft/line/mapper/RoleInfoMapper.xml | 37 ++ .../com/soft/line/mapper/RoleMenuMapper.java | 30 ++ .../com/soft/line/mapper/RoleMenuMapper.xml | 43 +++ .../com/soft/line/mapper/UserInfoMapper.java | 30 ++ .../com/soft/line/mapper/UserInfoMapper.xml | 54 +++ .../line/service/CertificateInfoService.java | 3 +- .../soft/line/service/CodeDetailService.java | 7 +- .../line/service/MenuInfoServiceImpl.java | 32 ++ .../impl/CertificateInfoServiceImpl.java | 7 +- .../service/impl/CodeDetailServiceImpl.java | 5 + .../line/service/impl/MenuInfoService.java | 13 + .../line/util/generator/mybatis-generator.xml | 72 +++- 38 files changed, 1721 insertions(+), 127 deletions(-) create mode 100644 src/main/java/com/soft/line/controller/MenuController.java create mode 100644 src/main/java/com/soft/line/entity/MenuButtonInfo.java create mode 100644 src/main/java/com/soft/line/entity/MenuInfo.java create mode 100644 src/main/java/com/soft/line/entity/RoleInfo.java create mode 100644 src/main/java/com/soft/line/entity/RoleMenu.java create mode 100644 src/main/java/com/soft/line/entity/UserInfo.java create mode 100644 src/main/java/com/soft/line/mapper/MenuButtonInfoMapper.java create mode 100644 src/main/java/com/soft/line/mapper/MenuButtonInfoMapper.xml create mode 100644 src/main/java/com/soft/line/mapper/MenuInfoMapper.java create mode 100644 src/main/java/com/soft/line/mapper/MenuInfoMapper.xml create mode 100644 src/main/java/com/soft/line/mapper/RoleInfoMapper.java create mode 100644 src/main/java/com/soft/line/mapper/RoleInfoMapper.xml create mode 100644 src/main/java/com/soft/line/mapper/RoleMenuMapper.java create mode 100644 src/main/java/com/soft/line/mapper/RoleMenuMapper.xml create mode 100644 src/main/java/com/soft/line/mapper/UserInfoMapper.java create mode 100644 src/main/java/com/soft/line/mapper/UserInfoMapper.xml create mode 100644 src/main/java/com/soft/line/service/MenuInfoServiceImpl.java create mode 100644 src/main/java/com/soft/line/service/impl/MenuInfoService.java diff --git a/src/main/java/com/soft/line/controller/CertificateInfoController.java b/src/main/java/com/soft/line/controller/CertificateInfoController.java index aca078e..17bc3ec 100644 --- a/src/main/java/com/soft/line/controller/CertificateInfoController.java +++ b/src/main/java/com/soft/line/controller/CertificateInfoController.java @@ -14,6 +14,7 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpSession; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -40,24 +41,13 @@ public class CertificateInfoController { @ApiOperation(value = "个人证书列表", notes = "证书列表") //设置请求参数 @ApiImplicitParams({ - @ApiImplicitParam(name = "id", value = "用户ID", required = true, dataType = "Long", paramType = "path") + @ApiImplicitParam(name = "id", value = "用户ID", required = true, dataType = "Integer", paramType = "path") }) @GetMapping("getCertificate/{id}") - public CommonResult getCertificateInfoByID(@PathVariable("id") Long id) { - CertificateInfo ci = certificateInfoService.selectByPrimaryKey2(id); - ci.setCertType(codeDetailService.selectContent1ByPrimaryKey("3",ci.getCertType())); + public CommonResult getCertificateInfoByID(@PathVariable("id") Integer id) { + CertificateInfo ci = certificateInfoService.selectByPrimaryKey(id); return CommonResult.success(ci); } - @ApiOperation(value = "个人证书列表", notes = "证书列表") - //设置请求参数 - @ApiImplicitParams({ - @ApiImplicitParam(name = "id", value = "用户ID", required = true, dataType = "Long", paramType = "path") - }) - @GetMapping("updateCertificate") - public CommonResult updateCertificateInfoByID(@PathVariable("id") Long id) { - CertificateInfo ci = certificateInfoService.selectByPrimaryKey2(id); - ci.setCertType(codeDetailService.selectContent1ByPrimaryKey("3",ci.getCertType())); - return CommonResult.success(ci); - } + } diff --git a/src/main/java/com/soft/line/controller/MenuController.java b/src/main/java/com/soft/line/controller/MenuController.java new file mode 100644 index 0000000..9afb9e0 --- /dev/null +++ b/src/main/java/com/soft/line/controller/MenuController.java @@ -0,0 +1,45 @@ +package com.soft.line.controller; + +import com.soft.line.entity.CertificateInfo; +import com.soft.line.entity.MenuButtonInfo; +import com.soft.line.entity.MenuInfo; +import com.soft.line.service.CodeDetailService; +import com.soft.line.service.impl.MenuInfoService; +import com.soft.line.util.exception.CommonResult; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@Api(value = "菜单接口") +@Slf4j +@RestController +public class MenuController { + + @Autowired + private MenuInfoService menuInfoService; + @Autowired + private CodeDetailService codeDetailService; + + @RequestMapping("/menus") + public CommonResult> getAllMenus() { + //System.out.println(codeDetailService.selectContent1ByPrimaryKey("4","3")); + return CommonResult.success(menuInfoService.selectAll()); + } + + @ApiOperation(value = "菜单按钮列表", notes = "菜单按钮列表") + @ApiImplicitParams({ + @ApiImplicitParam(name = "menuId", value = "菜单ID", required = true, dataType = "Integer", paramType = "path") + }) + @GetMapping("menu/{menuId}") + public CommonResult> getCertificateInfoByID(@PathVariable("menuId") Integer menuId) { + return CommonResult.success(menuInfoService.selectAllByMenuId(menuId)); + } + +} diff --git a/src/main/java/com/soft/line/entity/AttachementInfo.java b/src/main/java/com/soft/line/entity/AttachementInfo.java index 257070e..f2dc331 100644 --- a/src/main/java/com/soft/line/entity/AttachementInfo.java +++ b/src/main/java/com/soft/line/entity/AttachementInfo.java @@ -1,7 +1,5 @@ package com.soft.line.entity; -import com.fasterxml.jackson.annotation.JsonFormat; - import java.util.Date; public class AttachementInfo { @@ -11,7 +9,7 @@ public class AttachementInfo { * * @mbggenerated */ - private Long id; + private Integer id; /** * This field was generated by MyBatis Generator. @@ -43,7 +41,6 @@ public class AttachementInfo { * * @mbggenerated */ - @JsonFormat(pattern = "yyyy-MM-dd",timezone = "Asia/Shanghai") private Date modifyTime; /** @@ -54,7 +51,7 @@ public class AttachementInfo { * * @mbggenerated */ - public Long getId() { + public Integer getId() { return id; } @@ -66,7 +63,7 @@ public class AttachementInfo { * * @mbggenerated */ - public void setId(Long id) { + public void setId(Integer id) { this.id = id; } diff --git a/src/main/java/com/soft/line/entity/CertAttachInfo.java b/src/main/java/com/soft/line/entity/CertAttachInfo.java index 19c9378..72dff26 100644 --- a/src/main/java/com/soft/line/entity/CertAttachInfo.java +++ b/src/main/java/com/soft/line/entity/CertAttachInfo.java @@ -7,7 +7,7 @@ public class CertAttachInfo { * * @mbggenerated */ - private Long id; + private Integer id; /** * This field was generated by MyBatis Generator. @@ -15,7 +15,7 @@ public class CertAttachInfo { * * @mbggenerated */ - private Long certId; + private Integer certId; /** * This field was generated by MyBatis Generator. @@ -23,7 +23,7 @@ public class CertAttachInfo { * * @mbggenerated */ - private Long attachId; + private Integer attachId; /** * This method was generated by MyBatis Generator. @@ -33,7 +33,7 @@ public class CertAttachInfo { * * @mbggenerated */ - public Long getId() { + public Integer getId() { return id; } @@ -45,7 +45,7 @@ public class CertAttachInfo { * * @mbggenerated */ - public void setId(Long id) { + public void setId(Integer id) { this.id = id; } @@ -57,7 +57,7 @@ public class CertAttachInfo { * * @mbggenerated */ - public Long getCertId() { + public Integer getCertId() { return certId; } @@ -69,7 +69,7 @@ public class CertAttachInfo { * * @mbggenerated */ - public void setCertId(Long certId) { + public void setCertId(Integer certId) { this.certId = certId; } @@ -81,7 +81,7 @@ public class CertAttachInfo { * * @mbggenerated */ - public Long getAttachId() { + public Integer getAttachId() { return attachId; } @@ -93,7 +93,7 @@ public class CertAttachInfo { * * @mbggenerated */ - public void setAttachId(Long attachId) { + public void setAttachId(Integer attachId) { this.attachId = attachId; } } \ No newline at end of file diff --git a/src/main/java/com/soft/line/entity/CertificateInfo.java b/src/main/java/com/soft/line/entity/CertificateInfo.java index 571868d..5753a72 100644 --- a/src/main/java/com/soft/line/entity/CertificateInfo.java +++ b/src/main/java/com/soft/line/entity/CertificateInfo.java @@ -11,7 +11,7 @@ public class CertificateInfo { * * @mbggenerated */ - private Long id; + private Integer id; /** * This field was generated by MyBatis Generator. @@ -104,7 +104,7 @@ public class CertificateInfo { * * @mbggenerated */ - public Long getId() { + public Integer getId() { return id; } @@ -116,7 +116,7 @@ public class CertificateInfo { * * @mbggenerated */ - public void setId(Long id) { + public void setId(Integer id) { this.id = id; } diff --git a/src/main/java/com/soft/line/entity/ContAttachInfo.java b/src/main/java/com/soft/line/entity/ContAttachInfo.java index 1aa498e..931ad8a 100644 --- a/src/main/java/com/soft/line/entity/ContAttachInfo.java +++ b/src/main/java/com/soft/line/entity/ContAttachInfo.java @@ -7,7 +7,7 @@ public class ContAttachInfo { * * @mbggenerated */ - private Long id; + private Integer id; /** * This field was generated by MyBatis Generator. @@ -15,7 +15,7 @@ public class ContAttachInfo { * * @mbggenerated */ - private Long contId; + private Integer contId; /** * This field was generated by MyBatis Generator. @@ -23,7 +23,7 @@ public class ContAttachInfo { * * @mbggenerated */ - private Long attachId; + private Integer attachId; /** * This method was generated by MyBatis Generator. @@ -33,7 +33,7 @@ public class ContAttachInfo { * * @mbggenerated */ - public Long getId() { + public Integer getId() { return id; } @@ -45,7 +45,7 @@ public class ContAttachInfo { * * @mbggenerated */ - public void setId(Long id) { + public void setId(Integer id) { this.id = id; } @@ -57,7 +57,7 @@ public class ContAttachInfo { * * @mbggenerated */ - public Long getContId() { + public Integer getContId() { return contId; } @@ -69,7 +69,7 @@ public class ContAttachInfo { * * @mbggenerated */ - public void setContId(Long contId) { + public void setContId(Integer contId) { this.contId = contId; } @@ -81,7 +81,7 @@ public class ContAttachInfo { * * @mbggenerated */ - public Long getAttachId() { + public Integer getAttachId() { return attachId; } @@ -93,7 +93,7 @@ public class ContAttachInfo { * * @mbggenerated */ - public void setAttachId(Long attachId) { + public void setAttachId(Integer attachId) { this.attachId = attachId; } } \ No newline at end of file diff --git a/src/main/java/com/soft/line/entity/MenuButtonInfo.java b/src/main/java/com/soft/line/entity/MenuButtonInfo.java new file mode 100644 index 0000000..a43c560 --- /dev/null +++ b/src/main/java/com/soft/line/entity/MenuButtonInfo.java @@ -0,0 +1,165 @@ +package com.soft.line.entity; + +import java.util.Date; + +public class MenuButtonInfo { + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column menu_button_info.id + * + * @mbggenerated + */ + private Integer id; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column menu_button_info.menu_id + * + * @mbggenerated + */ + private Integer menuId; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column menu_button_info.button_id + * + * @mbggenerated + */ + private String buttonId; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column menu_button_info.modify_person + * + * @mbggenerated + */ + private String modifyPerson; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column menu_button_info.modify_time + * + * @mbggenerated + */ + private Date modifyTime; + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column menu_button_info.id + * + * @return the value of menu_button_info.id + * + * @mbggenerated + */ + public Integer getId() { + return id; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column menu_button_info.id + * + * @param id the value for menu_button_info.id + * + * @mbggenerated + */ + public void setId(Integer id) { + this.id = id; + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column menu_button_info.menu_id + * + * @return the value of menu_button_info.menu_id + * + * @mbggenerated + */ + public Integer getMenuId() { + return menuId; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column menu_button_info.menu_id + * + * @param menuId the value for menu_button_info.menu_id + * + * @mbggenerated + */ + public void setMenuId(Integer menuId) { + this.menuId = menuId; + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column menu_button_info.button_id + * + * @return the value of menu_button_info.button_id + * + * @mbggenerated + */ + public String getButtonId() { + return buttonId; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column menu_button_info.button_id + * + * @param buttonId the value for menu_button_info.button_id + * + * @mbggenerated + */ + public void setButtonId(String buttonId) { + this.buttonId = buttonId == null ? null : buttonId.trim(); + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column menu_button_info.modify_person + * + * @return the value of menu_button_info.modify_person + * + * @mbggenerated + */ + public String getModifyPerson() { + return modifyPerson; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column menu_button_info.modify_person + * + * @param modifyPerson the value for menu_button_info.modify_person + * + * @mbggenerated + */ + public void setModifyPerson(String modifyPerson) { + this.modifyPerson = modifyPerson == null ? null : modifyPerson.trim(); + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column menu_button_info.modify_time + * + * @return the value of menu_button_info.modify_time + * + * @mbggenerated + */ + public Date getModifyTime() { + return modifyTime; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column menu_button_info.modify_time + * + * @param modifyTime the value for menu_button_info.modify_time + * + * @mbggenerated + */ + public void setModifyTime(Date modifyTime) { + this.modifyTime = modifyTime; + } +} \ No newline at end of file diff --git a/src/main/java/com/soft/line/entity/MenuInfo.java b/src/main/java/com/soft/line/entity/MenuInfo.java new file mode 100644 index 0000000..09eec48 --- /dev/null +++ b/src/main/java/com/soft/line/entity/MenuInfo.java @@ -0,0 +1,293 @@ +package com.soft.line.entity; + +import java.util.Date; + +public class MenuInfo { + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column menu_info.id + * + * @mbggenerated + */ + private Integer id; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column menu_info.menu_icon + * + * @mbggenerated + */ + private String menuIcon; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column menu_info.menu_name + * + * @mbggenerated + */ + private String menuName; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column menu_info.state + * + * @mbggenerated + */ + private Integer state; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column menu_info.menu_url + * + * @mbggenerated + */ + private String menuUrl; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column menu_info.oredby + * + * @mbggenerated + */ + private String oredby; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column menu_info.p_id + * + * @mbggenerated + */ + private Integer pId; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column menu_info.modify_person + * + * @mbggenerated + */ + private String modifyPerson; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column menu_info.modify_time + * + * @mbggenerated + */ + private Date modifyTime; + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column menu_info.id + * + * @return the value of menu_info.id + * + * @mbggenerated + */ + public Integer getId() { + return id; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column menu_info.id + * + * @param id the value for menu_info.id + * + * @mbggenerated + */ + public void setId(Integer id) { + this.id = id; + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column menu_info.menu_icon + * + * @return the value of menu_info.menu_icon + * + * @mbggenerated + */ + public String getMenuIcon() { + return menuIcon; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column menu_info.menu_icon + * + * @param menuIcon the value for menu_info.menu_icon + * + * @mbggenerated + */ + public void setMenuIcon(String menuIcon) { + this.menuIcon = menuIcon == null ? null : menuIcon.trim(); + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column menu_info.menu_name + * + * @return the value of menu_info.menu_name + * + * @mbggenerated + */ + public String getMenuName() { + return menuName; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column menu_info.menu_name + * + * @param menuName the value for menu_info.menu_name + * + * @mbggenerated + */ + public void setMenuName(String menuName) { + this.menuName = menuName == null ? null : menuName.trim(); + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column menu_info.state + * + * @return the value of menu_info.state + * + * @mbggenerated + */ + public Integer getState() { + return state; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column menu_info.state + * + * @param state the value for menu_info.state + * + * @mbggenerated + */ + public void setState(Integer state) { + this.state = state; + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column menu_info.menu_url + * + * @return the value of menu_info.menu_url + * + * @mbggenerated + */ + public String getMenuUrl() { + return menuUrl; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column menu_info.menu_url + * + * @param menuUrl the value for menu_info.menu_url + * + * @mbggenerated + */ + public void setMenuUrl(String menuUrl) { + this.menuUrl = menuUrl == null ? null : menuUrl.trim(); + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column menu_info.oredby + * + * @return the value of menu_info.oredby + * + * @mbggenerated + */ + public String getOredby() { + return oredby; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column menu_info.oredby + * + * @param oredby the value for menu_info.oredby + * + * @mbggenerated + */ + public void setOredby(String oredby) { + this.oredby = oredby == null ? null : oredby.trim(); + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column menu_info.p_id + * + * @return the value of menu_info.p_id + * + * @mbggenerated + */ + public Integer getpId() { + return pId; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column menu_info.p_id + * + * @param pId the value for menu_info.p_id + * + * @mbggenerated + */ + public void setpId(Integer pId) { + this.pId = pId; + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column menu_info.modify_person + * + * @return the value of menu_info.modify_person + * + * @mbggenerated + */ + public String getModifyPerson() { + return modifyPerson; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column menu_info.modify_person + * + * @param modifyPerson the value for menu_info.modify_person + * + * @mbggenerated + */ + public void setModifyPerson(String modifyPerson) { + this.modifyPerson = modifyPerson == null ? null : modifyPerson.trim(); + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column menu_info.modify_time + * + * @return the value of menu_info.modify_time + * + * @mbggenerated + */ + public Date getModifyTime() { + return modifyTime; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column menu_info.modify_time + * + * @param modifyTime the value for menu_info.modify_time + * + * @mbggenerated + */ + public void setModifyTime(Date modifyTime) { + this.modifyTime = modifyTime; + } +} \ No newline at end of file diff --git a/src/main/java/com/soft/line/entity/RoleInfo.java b/src/main/java/com/soft/line/entity/RoleInfo.java new file mode 100644 index 0000000..1f6a125 --- /dev/null +++ b/src/main/java/com/soft/line/entity/RoleInfo.java @@ -0,0 +1,67 @@ +package com.soft.line.entity; + +public class RoleInfo { + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column role_info.id + * + * @mbggenerated + */ + private Integer id; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column role_info.name + * + * @mbggenerated + */ + private String name; + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column role_info.id + * + * @return the value of role_info.id + * + * @mbggenerated + */ + public Integer getId() { + return id; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column role_info.id + * + * @param id the value for role_info.id + * + * @mbggenerated + */ + public void setId(Integer id) { + this.id = id; + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column role_info.name + * + * @return the value of role_info.name + * + * @mbggenerated + */ + public String getName() { + return name; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column role_info.name + * + * @param name the value for role_info.name + * + * @mbggenerated + */ + public void setName(String name) { + this.name = name == null ? null : name.trim(); + } +} \ No newline at end of file diff --git a/src/main/java/com/soft/line/entity/RoleMenu.java b/src/main/java/com/soft/line/entity/RoleMenu.java new file mode 100644 index 0000000..70bfc1f --- /dev/null +++ b/src/main/java/com/soft/line/entity/RoleMenu.java @@ -0,0 +1,197 @@ +package com.soft.line.entity; + +import java.util.Date; + +public class RoleMenu { + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column role_menu.id + * + * @mbggenerated + */ + private Integer id; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column role_menu.role_id + * + * @mbggenerated + */ + private Integer roleId; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column role_menu.menu_button_id + * + * @mbggenerated + */ + private Integer menuButtonId; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column role_menu.view_flg + * + * @mbggenerated + */ + private String viewFlg; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column role_menu.modify_person + * + * @mbggenerated + */ + private String modifyPerson; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column role_menu.modify_time + * + * @mbggenerated + */ + private Date modifyTime; + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column role_menu.id + * + * @return the value of role_menu.id + * + * @mbggenerated + */ + public Integer getId() { + return id; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column role_menu.id + * + * @param id the value for role_menu.id + * + * @mbggenerated + */ + public void setId(Integer id) { + this.id = id; + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column role_menu.role_id + * + * @return the value of role_menu.role_id + * + * @mbggenerated + */ + public Integer getRoleId() { + return roleId; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column role_menu.role_id + * + * @param roleId the value for role_menu.role_id + * + * @mbggenerated + */ + public void setRoleId(Integer roleId) { + this.roleId = roleId; + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column role_menu.menu_button_id + * + * @return the value of role_menu.menu_button_id + * + * @mbggenerated + */ + public Integer getMenuButtonId() { + return menuButtonId; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column role_menu.menu_button_id + * + * @param menuButtonId the value for role_menu.menu_button_id + * + * @mbggenerated + */ + public void setMenuButtonId(Integer menuButtonId) { + this.menuButtonId = menuButtonId; + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column role_menu.view_flg + * + * @return the value of role_menu.view_flg + * + * @mbggenerated + */ + public String getViewFlg() { + return viewFlg; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column role_menu.view_flg + * + * @param viewFlg the value for role_menu.view_flg + * + * @mbggenerated + */ + public void setViewFlg(String viewFlg) { + this.viewFlg = viewFlg == null ? null : viewFlg.trim(); + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column role_menu.modify_person + * + * @return the value of role_menu.modify_person + * + * @mbggenerated + */ + public String getModifyPerson() { + return modifyPerson; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column role_menu.modify_person + * + * @param modifyPerson the value for role_menu.modify_person + * + * @mbggenerated + */ + public void setModifyPerson(String modifyPerson) { + this.modifyPerson = modifyPerson == null ? null : modifyPerson.trim(); + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column role_menu.modify_time + * + * @return the value of role_menu.modify_time + * + * @mbggenerated + */ + public Date getModifyTime() { + return modifyTime; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column role_menu.modify_time + * + * @param modifyTime the value for role_menu.modify_time + * + * @mbggenerated + */ + public void setModifyTime(Date modifyTime) { + this.modifyTime = modifyTime; + } +} \ No newline at end of file diff --git a/src/main/java/com/soft/line/entity/UserInfo.java b/src/main/java/com/soft/line/entity/UserInfo.java new file mode 100644 index 0000000..378e60d --- /dev/null +++ b/src/main/java/com/soft/line/entity/UserInfo.java @@ -0,0 +1,357 @@ +package com.soft.line.entity; + +import java.util.Date; + +public class UserInfo { + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column user_info.id + * + * @mbggenerated + */ + private Integer id; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column user_info.user_name + * + * @mbggenerated + */ + private String userName; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column user_info.password + * + * @mbggenerated + */ + private String password; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column user_info.phone + * + * @mbggenerated + */ + private String phone; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column user_info.modify_person + * + * @mbggenerated + */ + private String modifyPerson; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column user_info.modify_time + * + * @mbggenerated + */ + private Date modifyTime; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column user_info.head_img_url + * + * @mbggenerated + */ + private String headImgUrl; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column user_info.user_status + * + * @mbggenerated + */ + private String userStatus; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column user_info.role_id + * + * @mbggenerated + */ + private Integer roleId; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column user_info.salt + * + * @mbggenerated + */ + private String salt; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column user_info.open_id + * + * @mbggenerated + */ + private String openId; + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column user_info.id + * + * @return the value of user_info.id + * + * @mbggenerated + */ + public Integer getId() { + return id; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column user_info.id + * + * @param id the value for user_info.id + * + * @mbggenerated + */ + public void setId(Integer id) { + this.id = id; + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column user_info.user_name + * + * @return the value of user_info.user_name + * + * @mbggenerated + */ + public String getUserName() { + return userName; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column user_info.user_name + * + * @param userName the value for user_info.user_name + * + * @mbggenerated + */ + public void setUserName(String userName) { + this.userName = userName == null ? null : userName.trim(); + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column user_info.password + * + * @return the value of user_info.password + * + * @mbggenerated + */ + public String getPassword() { + return password; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column user_info.password + * + * @param password the value for user_info.password + * + * @mbggenerated + */ + public void setPassword(String password) { + this.password = password == null ? null : password.trim(); + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column user_info.phone + * + * @return the value of user_info.phone + * + * @mbggenerated + */ + public String getPhone() { + return phone; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column user_info.phone + * + * @param phone the value for user_info.phone + * + * @mbggenerated + */ + public void setPhone(String phone) { + this.phone = phone == null ? null : phone.trim(); + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column user_info.modify_person + * + * @return the value of user_info.modify_person + * + * @mbggenerated + */ + public String getModifyPerson() { + return modifyPerson; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column user_info.modify_person + * + * @param modifyPerson the value for user_info.modify_person + * + * @mbggenerated + */ + public void setModifyPerson(String modifyPerson) { + this.modifyPerson = modifyPerson == null ? null : modifyPerson.trim(); + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column user_info.modify_time + * + * @return the value of user_info.modify_time + * + * @mbggenerated + */ + public Date getModifyTime() { + return modifyTime; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column user_info.modify_time + * + * @param modifyTime the value for user_info.modify_time + * + * @mbggenerated + */ + public void setModifyTime(Date modifyTime) { + this.modifyTime = modifyTime; + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column user_info.head_img_url + * + * @return the value of user_info.head_img_url + * + * @mbggenerated + */ + public String getHeadImgUrl() { + return headImgUrl; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column user_info.head_img_url + * + * @param headImgUrl the value for user_info.head_img_url + * + * @mbggenerated + */ + public void setHeadImgUrl(String headImgUrl) { + this.headImgUrl = headImgUrl == null ? null : headImgUrl.trim(); + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column user_info.user_status + * + * @return the value of user_info.user_status + * + * @mbggenerated + */ + public String getUserStatus() { + return userStatus; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column user_info.user_status + * + * @param userStatus the value for user_info.user_status + * + * @mbggenerated + */ + public void setUserStatus(String userStatus) { + this.userStatus = userStatus == null ? null : userStatus.trim(); + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column user_info.role_id + * + * @return the value of user_info.role_id + * + * @mbggenerated + */ + public Integer getRoleId() { + return roleId; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column user_info.role_id + * + * @param roleId the value for user_info.role_id + * + * @mbggenerated + */ + public void setRoleId(Integer roleId) { + this.roleId = roleId; + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column user_info.salt + * + * @return the value of user_info.salt + * + * @mbggenerated + */ + public String getSalt() { + return salt; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column user_info.salt + * + * @param salt the value for user_info.salt + * + * @mbggenerated + */ + public void setSalt(String salt) { + this.salt = salt == null ? null : salt.trim(); + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column user_info.open_id + * + * @return the value of user_info.open_id + * + * @mbggenerated + */ + public String getOpenId() { + return openId; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column user_info.open_id + * + * @param openId the value for user_info.open_id + * + * @mbggenerated + */ + public void setOpenId(String openId) { + this.openId = openId == null ? null : openId.trim(); + } +} \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/AttachementInfoMapper.java b/src/main/java/com/soft/line/mapper/AttachementInfoMapper.java index 48598a6..cd1d849 100644 --- a/src/main/java/com/soft/line/mapper/AttachementInfoMapper.java +++ b/src/main/java/com/soft/line/mapper/AttachementInfoMapper.java @@ -18,7 +18,7 @@ public interface AttachementInfoMapper { * * @mbggenerated */ - AttachementInfo selectByPrimaryKey(Long id); + AttachementInfo selectByPrimaryKey(Integer id); /** * This method was generated by MyBatis Generator. diff --git a/src/main/java/com/soft/line/mapper/AttachementInfoMapper.xml b/src/main/java/com/soft/line/mapper/AttachementInfoMapper.xml index b79b830..166b425 100644 --- a/src/main/java/com/soft/line/mapper/AttachementInfoMapper.xml +++ b/src/main/java/com/soft/line/mapper/AttachementInfoMapper.xml @@ -1,18 +1,18 @@ - - - - + + + + - - - - - + + + + + - + select `id`, `attachment_name`, `attachement_url`, `modify_person`, `modify_time` from `attachement_info` - where `id` = #{id,jdbcType=BIGINT} + where `id` = #{id,jdbcType=INTEGER} - - - - + + + - + insert into `cert_attach_info` (`cert_id`, `attach_id`) - values (#{certId,jdbcType=BIGINT}, #{attachId,jdbcType=BIGINT}) + values (#{certId,jdbcType=INTEGER}, #{attachId,jdbcType=INTEGER}) - select `id`, `cert_id`, `attach_id` from `cert_attach_info` - where `id` = #{id,jdbcType=BIGINT} + where `id` = #{id,jdbcType=INTEGER} - - select `id`, - `cert_id`, - cert_type, - `cert_name`, - `cert_unit`, - `begin_date`, - `end_date`, - t.`note`, - `modify_person`, - `modify_time`, - `del_flg` - from `certificate_info` t - where `id` = #{id,jdbcType=BIGINT} - + + - + + + + + + + + + + + + insert into `menu_info` (`menu_icon`, `menu_name`, `state`, + `menu_url`, `oredby`, `p_id`, + `modify_person`, `modify_time`) + values (#{menuIcon,jdbcType=VARCHAR}, #{menuName,jdbcType=VARCHAR}, #{state,jdbcType=INTEGER}, + #{menuUrl,jdbcType=VARCHAR}, #{oredby,jdbcType=VARCHAR}, #{pId,jdbcType=INTEGER}, + #{modifyPerson,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}) + + + + + + \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/RoleInfoMapper.java b/src/main/java/com/soft/line/mapper/RoleInfoMapper.java new file mode 100644 index 0000000..04e5596 --- /dev/null +++ b/src/main/java/com/soft/line/mapper/RoleInfoMapper.java @@ -0,0 +1,30 @@ +package com.soft.line.mapper; + +import com.soft.line.entity.RoleInfo; +import java.util.List; + +public interface RoleInfoMapper { + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table role_info + * + * @mbggenerated + */ + int insert(RoleInfo record); + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table role_info + * + * @mbggenerated + */ + RoleInfo selectByPrimaryKey(Integer id); + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table role_info + * + * @mbggenerated + */ + List selectAll(); +} \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/RoleInfoMapper.xml b/src/main/java/com/soft/line/mapper/RoleInfoMapper.xml new file mode 100644 index 0000000..489069c --- /dev/null +++ b/src/main/java/com/soft/line/mapper/RoleInfoMapper.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + insert into `role_info` (`name`) + values (#{name,jdbcType=VARCHAR}) + + + + \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/RoleMenuMapper.java b/src/main/java/com/soft/line/mapper/RoleMenuMapper.java new file mode 100644 index 0000000..60dd180 --- /dev/null +++ b/src/main/java/com/soft/line/mapper/RoleMenuMapper.java @@ -0,0 +1,30 @@ +package com.soft.line.mapper; + +import com.soft.line.entity.RoleMenu; +import java.util.List; + +public interface RoleMenuMapper { + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table role_menu + * + * @mbggenerated + */ + int insert(RoleMenu record); + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table role_menu + * + * @mbggenerated + */ + RoleMenu selectByPrimaryKey(Integer id); + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table role_menu + * + * @mbggenerated + */ + List selectAll(); +} \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/RoleMenuMapper.xml b/src/main/java/com/soft/line/mapper/RoleMenuMapper.xml new file mode 100644 index 0000000..39a72f3 --- /dev/null +++ b/src/main/java/com/soft/line/mapper/RoleMenuMapper.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + insert into `role_menu` (`role_id`, `menu_button_id`, `view_flg`, + `modify_person`, `modify_time`) + values (#{roleId,jdbcType=INTEGER}, #{menuButtonId,jdbcType=INTEGER}, #{viewFlg,jdbcType=CHAR}, + #{modifyPerson,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}) + + + + \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/UserInfoMapper.java b/src/main/java/com/soft/line/mapper/UserInfoMapper.java new file mode 100644 index 0000000..bc89a99 --- /dev/null +++ b/src/main/java/com/soft/line/mapper/UserInfoMapper.java @@ -0,0 +1,30 @@ +package com.soft.line.mapper; + +import com.soft.line.entity.UserInfo; +import java.util.List; + +public interface UserInfoMapper { + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table user_info + * + * @mbggenerated + */ + int insert(UserInfo record); + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table user_info + * + * @mbggenerated + */ + UserInfo selectByPrimaryKey(Integer id); + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table user_info + * + * @mbggenerated + */ + List selectAll(); +} \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/UserInfoMapper.xml b/src/main/java/com/soft/line/mapper/UserInfoMapper.xml new file mode 100644 index 0000000..0eda6fa --- /dev/null +++ b/src/main/java/com/soft/line/mapper/UserInfoMapper.xml @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + insert into `user_info` (`user_name`, `password`, `phone`, + `modify_person`, `modify_time`, `head_img_url`, + `user_status`, `role_id`, `salt`, + `open_id`) + values (#{userName,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR}, #{phone,jdbcType=VARCHAR}, + #{modifyPerson,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}, #{headImgUrl,jdbcType=VARCHAR}, + #{userStatus,jdbcType=VARCHAR}, #{roleId,jdbcType=INTEGER}, #{salt,jdbcType=VARCHAR}, + #{openId,jdbcType=VARCHAR}) + + + + \ No newline at end of file diff --git a/src/main/java/com/soft/line/service/CertificateInfoService.java b/src/main/java/com/soft/line/service/CertificateInfoService.java index 7ce0b4b..2557052 100644 --- a/src/main/java/com/soft/line/service/CertificateInfoService.java +++ b/src/main/java/com/soft/line/service/CertificateInfoService.java @@ -16,7 +16,6 @@ public interface CertificateInfoService { public List selectCertificateAll(); - public CertificateInfo selectByPrimaryKey(Long id); + public CertificateInfo selectByPrimaryKey(Integer id); - public CertificateInfo selectByPrimaryKey2(Long id); } diff --git a/src/main/java/com/soft/line/service/CodeDetailService.java b/src/main/java/com/soft/line/service/CodeDetailService.java index 440b9c9..6659ad9 100644 --- a/src/main/java/com/soft/line/service/CodeDetailService.java +++ b/src/main/java/com/soft/line/service/CodeDetailService.java @@ -1,5 +1,10 @@ package com.soft.line.service; +import com.soft.line.entity.CodeDetail; + public interface CodeDetailService { - public String selectContent1ByPrimaryKey(String codeType,String codeDetail); + + public CodeDetail selectByPrimaryKey(String codeType, String codeDetail); + + public String selectContent1ByPrimaryKey(String codeType, String codeDetail); } diff --git a/src/main/java/com/soft/line/service/MenuInfoServiceImpl.java b/src/main/java/com/soft/line/service/MenuInfoServiceImpl.java new file mode 100644 index 0000000..b8d4c80 --- /dev/null +++ b/src/main/java/com/soft/line/service/MenuInfoServiceImpl.java @@ -0,0 +1,32 @@ +package com.soft.line.service; + +import com.soft.line.entity.MenuButtonInfo; +import com.soft.line.entity.MenuInfo; +import com.soft.line.mapper.MenuButtonInfoMapper; +import com.soft.line.mapper.MenuInfoMapper; +import com.soft.line.service.impl.MenuInfoService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +@Slf4j +public class MenuInfoServiceImpl implements MenuInfoService { + + @Autowired + private MenuInfoMapper menuInfoMapper; + @Autowired + private MenuButtonInfoMapper menuButtonInfoMapper; + + @Override + public List selectAll() { + return menuInfoMapper.selectAll(); + } + + @Override + public List selectAllByMenuId(Integer menuId) { + return menuButtonInfoMapper.selectAllByMenuId(menuId); + } +} diff --git a/src/main/java/com/soft/line/service/impl/CertificateInfoServiceImpl.java b/src/main/java/com/soft/line/service/impl/CertificateInfoServiceImpl.java index e850cf8..83375e5 100644 --- a/src/main/java/com/soft/line/service/impl/CertificateInfoServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/CertificateInfoServiceImpl.java @@ -26,12 +26,7 @@ public class CertificateInfoServiceImpl implements CertificateInfoService { } @Override - public CertificateInfo selectByPrimaryKey(Long id) { + public CertificateInfo selectByPrimaryKey(Integer id) { return certificateInfoMapper.selectByPrimaryKey(id); } - - @Override - public CertificateInfo selectByPrimaryKey2(Long id) { - return certificateInfoMapper.selectByPrimaryKey2(id); - } } diff --git a/src/main/java/com/soft/line/service/impl/CodeDetailServiceImpl.java b/src/main/java/com/soft/line/service/impl/CodeDetailServiceImpl.java index 2938769..79848c6 100644 --- a/src/main/java/com/soft/line/service/impl/CodeDetailServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/CodeDetailServiceImpl.java @@ -13,6 +13,11 @@ public class CodeDetailServiceImpl implements CodeDetailService { @Autowired private CodeDetailMapper codeDetailMapper; + @Override + public CodeDetail selectByPrimaryKey(String codeType, String codeDetail) { + return codeDetailMapper.selectByPrimaryKey(codeType,codeDetail); + } + @Override public String selectContent1ByPrimaryKey(String codeType, String codeDetail) { return codeDetailMapper.selectContent1ByPrimaryKey(codeType,codeDetail); diff --git a/src/main/java/com/soft/line/service/impl/MenuInfoService.java b/src/main/java/com/soft/line/service/impl/MenuInfoService.java new file mode 100644 index 0000000..6d56686 --- /dev/null +++ b/src/main/java/com/soft/line/service/impl/MenuInfoService.java @@ -0,0 +1,13 @@ +package com.soft.line.service.impl; + +import com.soft.line.entity.MenuButtonInfo; +import com.soft.line.entity.MenuInfo; + +import java.util.List; + +public interface MenuInfoService { + + public List selectAll(); + + public List selectAllByMenuId(Integer menuId); +} diff --git a/src/main/java/com/soft/line/util/generator/mybatis-generator.xml b/src/main/java/com/soft/line/util/generator/mybatis-generator.xml index 8520cf1..3f0439c 100644 --- a/src/main/java/com/soft/line/util/generator/mybatis-generator.xml +++ b/src/main/java/com/soft/line/util/generator/mybatis-generator.xml @@ -118,7 +118,7 @@ delimitIdentifiers="true" delimitAllColumns="true"> -
--> + +
--> + + +
+ + +
+ + +
+ + +
+ +
\ No newline at end of file -- Gitee From dc0589a54028f9d18f39def285505115f2f0e88f Mon Sep 17 00:00:00 2001 From: wuxueqiao <17625808004@163.com> Date: Thu, 21 May 2020 11:18:31 +0800 Subject: [PATCH 021/211] =?UTF-8?q?=E8=AF=81=E4=B9=A6=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=EF=BC=8C=E4=BB=A5=E5=8F=8A=E7=9B=B8=E5=85=B3=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 18 ++-- .../controller/CertificateInfoController.java | 32 +++---- .../com/soft/line/entity/CertificateInfo.java | 83 +++++++++---------- .../line/mapper/CertificateInfoMapper.xml | 35 ++++---- .../line/service/CertificateInfoService.java | 3 +- .../impl/CertificateInfoServiceImpl.java | 7 +- src/main/resources/application.properties | 5 +- 7 files changed, 89 insertions(+), 94 deletions(-) diff --git a/pom.xml b/pom.xml index d100748..f1c792f 100644 --- a/pom.xml +++ b/pom.xml @@ -151,9 +151,13 @@ com.google.code.gson gson - 2.6.2 + 2.8.0 + + + org.json + json + 20090211 - io.jsonwebtoken jjwt @@ -165,17 +169,13 @@ jedis 2.9.0 - - com.google.code.gson - gson - 2.8.6 - + com.github.pagehelper - pagehelper - 5.1.11 + pagehelper-spring-boot-starter + 1.2.5 diff --git a/src/main/java/com/soft/line/controller/CertificateInfoController.java b/src/main/java/com/soft/line/controller/CertificateInfoController.java index 40a8cc2..b097541 100644 --- a/src/main/java/com/soft/line/controller/CertificateInfoController.java +++ b/src/main/java/com/soft/line/controller/CertificateInfoController.java @@ -1,21 +1,16 @@ package com.soft.line.controller; -import com.soft.line.aop.Permission; -import com.soft.line.entity.CertificateInfo; + import com.soft.line.service.CertificateInfoService; import com.soft.line.util.exception.CommonResult; -import com.soft.line.util.pagehelper.PageBeans; import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import java.util.HashMap; -import java.util.List; import java.util.Map; /** @@ -34,27 +29,22 @@ public class CertificateInfoController { - - //设置访问权限 - @Permission - @ApiOperation(value = "个人证书列表", notes = "证书列表") + /** + * @Description 证书查询 模糊查询 个人证书查询 分页 + * @param map 参数：pageSize，pageNum，查询条件：证书名称，人员姓名等 + * @return + */ + @ApiOperation(value = "证书列表", notes = "查询证书列表") //设置请求参数 @ApiImplicitParams({ // @ApiImplicitParam(paramType = "query", name = "userName", value = "名称", required = false, dataType = "String"), // @ApiImplicitParam(paramType = "query", name = "dicCode", value = "编码", required = false, dataType = "String") // ..... }) - @GetMapping("/getPersonalAll/{userName}") - public CommonResult> getPersonalAll(@PathVariable("userName") String userName) { - return CommonResult.success(certificateInfoService.getPersonalAll(userName)); - - } - - - //map 封装请求分页参数 + // @Permission @PostMapping("/getCompanyAllCertificates") - public PageBeans getCompanyAllCertificates(@RequestBody Map map){ - return certificateInfoService.getAllCompanyCertificates(map); + public CommonResult getCompanyAllCertificates(@RequestBody Map map){ + return CommonResult.success(certificateInfoService.getAllCompanyCertificates(map)); } } diff --git a/src/main/java/com/soft/line/entity/CertificateInfo.java b/src/main/java/com/soft/line/entity/CertificateInfo.java index 24ecf5e..217c4cf 100644 --- a/src/main/java/com/soft/line/entity/CertificateInfo.java +++ b/src/main/java/com/soft/line/entity/CertificateInfo.java @@ -1,18 +1,15 @@ package com.soft.line.entity; -import java.io.Serializable; import java.util.Date; - -public class CertificateInfo implements Serializable{ - private static final long serialVersionUID = 688776107177440102L; +public class CertificateInfo { /** * This field was generated by MyBatis Generator. * This field corresponds to the database column certificate_info.id * * @mbggenerated */ - private Long id; + private Integer id; /** * This field was generated by MyBatis Generator. @@ -20,7 +17,7 @@ public class CertificateInfo implements Serializable{ * * @mbggenerated */ - private Long certId; + private String certId; /** * This field was generated by MyBatis Generator. @@ -62,14 +59,6 @@ public class CertificateInfo implements Serializable{ */ private Date endDate; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column certificate_info.cert_attachment - * - * @mbggenerated - */ - private String certAttachment; - /** * This field was generated by MyBatis Generator. * This field corresponds to the database column certificate_info.note @@ -94,6 +83,14 @@ public class CertificateInfo implements Serializable{ */ private Date modifyTime; + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column certificate_info.del_flg + * + * @mbggenerated + */ + private String delFlg; + /** * This method was generated by MyBatis Generator. * This method returns the value of the database column certificate_info.id @@ -102,7 +99,7 @@ public class CertificateInfo implements Serializable{ * * @mbggenerated */ - public Long getId() { + public Integer getId() { return id; } @@ -114,7 +111,7 @@ public class CertificateInfo implements Serializable{ * * @mbggenerated */ - public void setId(Long id) { + public void setId(Integer id) { this.id = id; } @@ -126,7 +123,7 @@ public class CertificateInfo implements Serializable{ * * @mbggenerated */ - public Long getCertId() { + public String getCertId() { return certId; } @@ -138,8 +135,8 @@ public class CertificateInfo implements Serializable{ * * @mbggenerated */ - public void setCertId(Long certId) { - this.certId = certId; + public void setCertId(String certId) { + this.certId = certId == null ? null : certId.trim(); } /** @@ -262,30 +259,6 @@ public class CertificateInfo implements Serializable{ this.endDate = endDate; } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column certificate_info.cert_attachment - * - * @return the value of certificate_info.cert_attachment - * - * @mbggenerated - */ - public String getCertAttachment() { - return certAttachment; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column certificate_info.cert_attachment - * - * @param certAttachment the value for certificate_info.cert_attachment - * - * @mbggenerated - */ - public void setCertAttachment(String certAttachment) { - this.certAttachment = certAttachment == null ? null : certAttachment.trim(); - } - /** * This method was generated by MyBatis Generator. * This method returns the value of the database column certificate_info.note @@ -357,4 +330,28 @@ public class CertificateInfo implements Serializable{ public void setModifyTime(Date modifyTime) { this.modifyTime = modifyTime; } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column certificate_info.del_flg + * + * @return the value of certificate_info.del_flg + * + * @mbggenerated + */ + public String getDelFlg() { + return delFlg; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column certificate_info.del_flg + * + * @param delFlg the value for certificate_info.del_flg + * + * @mbggenerated + */ + public void setDelFlg(String delFlg) { + this.delFlg = delFlg == null ? null : delFlg.trim(); + } } \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/CertificateInfoMapper.xml b/src/main/java/com/soft/line/mapper/CertificateInfoMapper.xml index a6ded55..6e0cb35 100644 --- a/src/main/java/com/soft/line/mapper/CertificateInfoMapper.xml +++ b/src/main/java/com/soft/line/mapper/CertificateInfoMapper.xml @@ -6,17 +6,17 @@ WARNING - @mbggenerated This element is automatically generated by MyBatis Generator, do not modify. --> - - + + - + insert into `certificate_info` (`cert_id`, `cert_type`, `cert_name`, `cert_unit`, `begin_date`, `end_date`, - `cert_attachment`, `note`, `modify_person`, - `modify_time`) - values (#{certId,jdbcType=BIGINT}, #{certType,jdbcType=VARCHAR}, #{certName,jdbcType=VARCHAR}, + `note`, `modify_person`, `modify_time`, + `del_flg`) + values (#{certId,jdbcType=VARCHAR}, #{certType,jdbcType=VARCHAR}, #{certName,jdbcType=VARCHAR}, #{certUnit,jdbcType=VARCHAR}, #{beginDate,jdbcType=TIMESTAMP}, #{endDate,jdbcType=TIMESTAMP}, - #{certAttachment,jdbcType=VARCHAR}, #{note,jdbcType=VARCHAR}, #{modifyPerson,jdbcType=VARCHAR}, - #{modifyTime,jdbcType=TIMESTAMP}) + #{note,jdbcType=VARCHAR}, #{modifyPerson,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}, + #{delFlg,jdbcType=CHAR}) - select `id`, `cert_id`, `cert_type`, `cert_name`, `cert_unit`, `begin_date`, `end_date`, - `cert_attachment`, `note`, `modify_person`, `modify_time` + `note`, `modify_person`, `modify_time`, `del_flg` from `certificate_info` - where `id` = #{id,jdbcType=BIGINT} + where `id` = #{id,jdbcType=INTEGER} - - select `id`, `cert_id`, `cert_type`, `cert_name`, `cert_unit`, `begin_date`, `end_date`, - `cert_attachment`, `note`, `modify_person`, `modify_time` + `note`, `modify_person`, `modify_time`, `del_flg` from `certificate_info` + WHERE 1=1 + + and instr(`cert_type`,#{certType,jdbcType=VARCHAR})>0 + \ No newline at end of file diff --git a/src/main/java/com/soft/line/service/CertificateInfoService.java b/src/main/java/com/soft/line/service/CertificateInfoService.java index 673ea55..64f94f1 100644 --- a/src/main/java/com/soft/line/service/CertificateInfoService.java +++ b/src/main/java/com/soft/line/service/CertificateInfoService.java @@ -1,5 +1,6 @@ package com.soft.line.service; +import com.github.pagehelper.PageInfo; import com.soft.line.entity.CertificateInfo; import com.soft.line.mapper.CertificateInfoMapper; import com.soft.line.util.pagehelper.PageBeans; @@ -18,5 +19,5 @@ public interface CertificateInfoService { public List getPersonalAll(String userName); - public PageBeans getAllCompanyCertificates(Map map); + public PageInfo getAllCompanyCertificates(final Map map); } diff --git a/src/main/java/com/soft/line/service/impl/CertificateInfoServiceImpl.java b/src/main/java/com/soft/line/service/impl/CertificateInfoServiceImpl.java index acadc20..b83fca9 100644 --- a/src/main/java/com/soft/line/service/impl/CertificateInfoServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/CertificateInfoServiceImpl.java @@ -1,6 +1,7 @@ package com.soft.line.service.impl; import com.github.pagehelper.Page; +import com.github.pagehelper.PageInfo; import com.soft.line.entity.CertificateInfo; import com.soft.line.mapper.CertificateInfoMapper; import com.soft.line.service.CertificateInfoService; @@ -29,10 +30,10 @@ public class CertificateInfoServiceImpl implements CertificateInfoService { } @Override - public PageBeans getAllCompanyCertificates(Map map) { - final Page> page = PageUtil.setPageParam(map); + public PageInfo getAllCompanyCertificates(final Map map) { + PageUtil.setPageParam(map); List certificateInfos=certificateInfoMapper.getAllCompanyCertificates(map); - PageBeans beans = new PageBeans(certificateInfos); + PageInfo beans = new PageInfo(certificateInfos); beans.setList(certificateInfos); return beans; } diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 29285bc..f6a6dfe 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -32,7 +32,10 @@ spring.jedis.maxWaitMillis =100000 #mybatis log logging.level.com.soft.line.mapper = debug - +pagehelper.helper-dialect=mysql +pagehelper.params=count=countSql +pagehelper.reasonable=true +pagehelper.support-methods-arguments=true #mybatisӳļ· #mybatis.mapper-locations=com.soft.line.mapper/*.xml #ʵ· -- Gitee From 157198b2131a2d23d6b114d828f519198819d648 Mon Sep 17 00:00:00 2001 From: wuxueqiao <17625808004@163.com> Date: Thu, 21 May 2020 13:29:14 +0800 Subject: [PATCH 022/211] =?UTF-8?q?mapper=E6=96=87=E4=BB=B6=E7=9B=B8?= =?UTF-8?q?=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/soft/line/entity/AttachmentInfo.java | 165 ++++++ .../com/soft/line/entity/CertAttachInfo.java | 99 ++++ .../java/com/soft/line/entity/CodeDetail.java | 259 +++++++++ .../com/soft/line/entity/ContractInfo.java | 518 ++++++++++++++++++ .../com/soft/line/entity/MenuButtonInfo.java | 165 ++++++ .../java/com/soft/line/entity/MenuInfo.java | 293 ++++++++++ .../line/mapper/AttachmentInfoMapper.java | 32 ++ .../soft/line/mapper/AttachmentInfoMapper.xml | 42 ++ .../line/mapper/CertAttachInfoMapper.java | 30 + .../soft/line/mapper/CertAttachInfoMapper.xml | 38 ++ .../soft/line/mapper/CodeDetailMapper.java | 31 ++ .../com/soft/line/mapper/CodeDetailMapper.xml | 50 ++ .../soft/line/mapper/ContractInfoMapper.java | 31 ++ .../soft/line/mapper/ContractInfoMapper.xml | 65 +++ .../line/mapper/MenuButtonInfoMapper.java | 30 + .../soft/line/mapper/MenuButtonInfoMapper.xml | 42 ++ .../com/soft/line/mapper/MenuInfoMapper.java | 30 + .../com/soft/line/mapper/MenuInfoMapper.xml | 50 ++ .../line/service/CertificateInfoService.java | 4 - .../impl/CertificateInfoServiceImpl.java | 2 - 20 files changed, 1970 insertions(+), 6 deletions(-) create mode 100644 src/main/java/com/soft/line/entity/AttachmentInfo.java create mode 100644 src/main/java/com/soft/line/entity/CertAttachInfo.java create mode 100644 src/main/java/com/soft/line/entity/CodeDetail.java create mode 100644 src/main/java/com/soft/line/entity/ContractInfo.java create mode 100644 src/main/java/com/soft/line/entity/MenuButtonInfo.java create mode 100644 src/main/java/com/soft/line/entity/MenuInfo.java create mode 100644 src/main/java/com/soft/line/mapper/AttachmentInfoMapper.java create mode 100644 src/main/java/com/soft/line/mapper/AttachmentInfoMapper.xml create mode 100644 src/main/java/com/soft/line/mapper/CertAttachInfoMapper.java create mode 100644 src/main/java/com/soft/line/mapper/CertAttachInfoMapper.xml create mode 100644 src/main/java/com/soft/line/mapper/CodeDetailMapper.java create mode 100644 src/main/java/com/soft/line/mapper/CodeDetailMapper.xml create mode 100644 src/main/java/com/soft/line/mapper/ContractInfoMapper.java create mode 100644 src/main/java/com/soft/line/mapper/ContractInfoMapper.xml create mode 100644 src/main/java/com/soft/line/mapper/MenuButtonInfoMapper.java create mode 100644 src/main/java/com/soft/line/mapper/MenuButtonInfoMapper.xml create mode 100644 src/main/java/com/soft/line/mapper/MenuInfoMapper.java create mode 100644 src/main/java/com/soft/line/mapper/MenuInfoMapper.xml diff --git a/src/main/java/com/soft/line/entity/AttachmentInfo.java b/src/main/java/com/soft/line/entity/AttachmentInfo.java new file mode 100644 index 0000000..3906085 --- /dev/null +++ b/src/main/java/com/soft/line/entity/AttachmentInfo.java @@ -0,0 +1,165 @@ +package com.soft.line.entity; + +import java.util.Date; + +public class AttachmentInfo { + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column attachment_info.id + * + * @mbggenerated + */ + private Integer id; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column attachment_info.attachment_name + * + * @mbggenerated + */ + private String attachmentName; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column attachment_info.attachement_url + * + * @mbggenerated + */ + private String attachementUrl; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column attachment_info.modify_person + * + * @mbggenerated + */ + private String modifyPerson; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column attachment_info.modify_time + * + * @mbggenerated + */ + private Date modifyTime; + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column attachment_info.id + * + * @return the value of attachment_info.id + * + * @mbggenerated + */ + public Integer getId() { + return id; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column attachment_info.id + * + * @param id the value for attachment_info.id + * + * @mbggenerated + */ + public void setId(Integer id) { + this.id = id; + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column attachment_info.attachment_name + * + * @return the value of attachment_info.attachment_name + * + * @mbggenerated + */ + public String getAttachmentName() { + return attachmentName; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column attachment_info.attachment_name + * + * @param attachmentName the value for attachment_info.attachment_name + * + * @mbggenerated + */ + public void setAttachmentName(String attachmentName) { + this.attachmentName = attachmentName == null ? null : attachmentName.trim(); + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column attachment_info.attachement_url + * + * @return the value of attachment_info.attachement_url + * + * @mbggenerated + */ + public String getAttachementUrl() { + return attachementUrl; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column attachment_info.attachement_url + * + * @param attachementUrl the value for attachment_info.attachement_url + * + * @mbggenerated + */ + public void setAttachementUrl(String attachementUrl) { + this.attachementUrl = attachementUrl == null ? null : attachementUrl.trim(); + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column attachment_info.modify_person + * + * @return the value of attachment_info.modify_person + * + * @mbggenerated + */ + public String getModifyPerson() { + return modifyPerson; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column attachment_info.modify_person + * + * @param modifyPerson the value for attachment_info.modify_person + * + * @mbggenerated + */ + public void setModifyPerson(String modifyPerson) { + this.modifyPerson = modifyPerson == null ? null : modifyPerson.trim(); + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column attachment_info.modify_time + * + * @return the value of attachment_info.modify_time + * + * @mbggenerated + */ + public Date getModifyTime() { + return modifyTime; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column attachment_info.modify_time + * + * @param modifyTime the value for attachment_info.modify_time + * + * @mbggenerated + */ + public void setModifyTime(Date modifyTime) { + this.modifyTime = modifyTime; + } +} \ No newline at end of file diff --git a/src/main/java/com/soft/line/entity/CertAttachInfo.java b/src/main/java/com/soft/line/entity/CertAttachInfo.java new file mode 100644 index 0000000..72dff26 --- /dev/null +++ b/src/main/java/com/soft/line/entity/CertAttachInfo.java @@ -0,0 +1,99 @@ +package com.soft.line.entity; + +public class CertAttachInfo { + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column cert_attach_info.id + * + * @mbggenerated + */ + private Integer id; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column cert_attach_info.cert_id + * + * @mbggenerated + */ + private Integer certId; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column cert_attach_info.attach_id + * + * @mbggenerated + */ + private Integer attachId; + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column cert_attach_info.id + * + * @return the value of cert_attach_info.id + * + * @mbggenerated + */ + public Integer getId() { + return id; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column cert_attach_info.id + * + * @param id the value for cert_attach_info.id + * + * @mbggenerated + */ + public void setId(Integer id) { + this.id = id; + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column cert_attach_info.cert_id + * + * @return the value of cert_attach_info.cert_id + * + * @mbggenerated + */ + public Integer getCertId() { + return certId; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column cert_attach_info.cert_id + * + * @param certId the value for cert_attach_info.cert_id + * + * @mbggenerated + */ + public void setCertId(Integer certId) { + this.certId = certId; + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column cert_attach_info.attach_id + * + * @return the value of cert_attach_info.attach_id + * + * @mbggenerated + */ + public Integer getAttachId() { + return attachId; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column cert_attach_info.attach_id + * + * @param attachId the value for cert_attach_info.attach_id + * + * @mbggenerated + */ + public void setAttachId(Integer attachId) { + this.attachId = attachId; + } +} \ No newline at end of file diff --git a/src/main/java/com/soft/line/entity/CodeDetail.java b/src/main/java/com/soft/line/entity/CodeDetail.java new file mode 100644 index 0000000..7d43f46 --- /dev/null +++ b/src/main/java/com/soft/line/entity/CodeDetail.java @@ -0,0 +1,259 @@ +package com.soft.line.entity; + +public class CodeDetail { + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column code_detail.code_type + * + * @mbggenerated + */ + private String codeType; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column code_detail.code_detail + * + * @mbggenerated + */ + private String codeDetail; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column code_detail.code_content1 + * + * @mbggenerated + */ + private String codeContent1; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column code_detail.code_content2 + * + * @mbggenerated + */ + private String codeContent2; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column code_detail.code_content3 + * + * @mbggenerated + */ + private String codeContent3; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column code_detail.code_content4 + * + * @mbggenerated + */ + private String codeContent4; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column code_detail.orderby + * + * @mbggenerated + */ + private Integer orderby; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column code_detail.note + * + * @mbggenerated + */ + private String note; + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column code_detail.code_type + * + * @return the value of code_detail.code_type + * + * @mbggenerated + */ + public String getCodeType() { + return codeType; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column code_detail.code_type + * + * @param codeType the value for code_detail.code_type + * + * @mbggenerated + */ + public void setCodeType(String codeType) { + this.codeType = codeType == null ? null : codeType.trim(); + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column code_detail.code_detail + * + * @return the value of code_detail.code_detail + * + * @mbggenerated + */ + public String getCodeDetail() { + return codeDetail; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column code_detail.code_detail + * + * @param codeDetail the value for code_detail.code_detail + * + * @mbggenerated + */ + public void setCodeDetail(String codeDetail) { + this.codeDetail = codeDetail == null ? null : codeDetail.trim(); + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column code_detail.code_content1 + * + * @return the value of code_detail.code_content1 + * + * @mbggenerated + */ + public String getCodeContent1() { + return codeContent1; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column code_detail.code_content1 + * + * @param codeContent1 the value for code_detail.code_content1 + * + * @mbggenerated + */ + public void setCodeContent1(String codeContent1) { + this.codeContent1 = codeContent1 == null ? null : codeContent1.trim(); + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column code_detail.code_content2 + * + * @return the value of code_detail.code_content2 + * + * @mbggenerated + */ + public String getCodeContent2() { + return codeContent2; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column code_detail.code_content2 + * + * @param codeContent2 the value for code_detail.code_content2 + * + * @mbggenerated + */ + public void setCodeContent2(String codeContent2) { + this.codeContent2 = codeContent2 == null ? null : codeContent2.trim(); + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column code_detail.code_content3 + * + * @return the value of code_detail.code_content3 + * + * @mbggenerated + */ + public String getCodeContent3() { + return codeContent3; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column code_detail.code_content3 + * + * @param codeContent3 the value for code_detail.code_content3 + * + * @mbggenerated + */ + public void setCodeContent3(String codeContent3) { + this.codeContent3 = codeContent3 == null ? null : codeContent3.trim(); + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column code_detail.code_content4 + * + * @return the value of code_detail.code_content4 + * + * @mbggenerated + */ + public String getCodeContent4() { + return codeContent4; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column code_detail.code_content4 + * + * @param codeContent4 the value for code_detail.code_content4 + * + * @mbggenerated + */ + public void setCodeContent4(String codeContent4) { + this.codeContent4 = codeContent4 == null ? null : codeContent4.trim(); + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column code_detail.orderby + * + * @return the value of code_detail.orderby + * + * @mbggenerated + */ + public Integer getOrderby() { + return orderby; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column code_detail.orderby + * + * @param orderby the value for code_detail.orderby + * + * @mbggenerated + */ + public void setOrderby(Integer orderby) { + this.orderby = orderby; + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column code_detail.note + * + * @return the value of code_detail.note + * + * @mbggenerated + */ + public String getNote() { + return note; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column code_detail.note + * + * @param note the value for code_detail.note + * + * @mbggenerated + */ + public void setNote(String note) { + this.note = note == null ? null : note.trim(); + } +} \ No newline at end of file diff --git a/src/main/java/com/soft/line/entity/ContractInfo.java b/src/main/java/com/soft/line/entity/ContractInfo.java new file mode 100644 index 0000000..3b8b555 --- /dev/null +++ b/src/main/java/com/soft/line/entity/ContractInfo.java @@ -0,0 +1,518 @@ +package com.soft.line.entity; + +import java.math.BigDecimal; +import java.util.Date; + +public class ContractInfo { + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column contract_info.id + * + * @mbggenerated + */ + private Integer id; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column contract_info.dep_id + * + * @mbggenerated + */ + private String depId; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column contract_info.contract_name + * + * @mbggenerated + */ + private String contractName; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column contract_info.pro_id + * + * @mbggenerated + */ + private String proId; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column contract_info.total amount + * + * @mbggenerated + */ + private BigDecimal totalAmount; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column contract_info.part_a + * + * @mbggenerated + */ + private String partA; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column contract_info.part_b + * + * @mbggenerated + */ + private String partB; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column contract_info.sign_time + * + * @mbggenerated + */ + private Date signTime; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column contract_info.sign_addr + * + * @mbggenerated + */ + private String signAddr; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column contract_info.begin_date + * + * @mbggenerated + */ + private Date beginDate; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column contract_info.end_date + * + * @mbggenerated + */ + private Date endDate; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column contract_info.payment + * + * @mbggenerated + */ + private String payment; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column contract_info.note + * + * @mbggenerated + */ + private String note; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column contract_info.modify_person + * + * @mbggenerated + */ + private String modifyPerson; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column contract_info.modify_time + * + * @mbggenerated + */ + private Date modifyTime; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column contract_info.del_flg + * + * @mbggenerated + */ + private String delFlg; + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column contract_info.id + * + * @return the value of contract_info.id + * + * @mbggenerated + */ + public Integer getId() { + return id; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column contract_info.id + * + * @param id the value for contract_info.id + * + * @mbggenerated + */ + public void setId(Integer id) { + this.id = id; + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column contract_info.dep_id + * + * @return the value of contract_info.dep_id + * + * @mbggenerated + */ + public String getDepId() { + return depId; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column contract_info.dep_id + * + * @param depId the value for contract_info.dep_id + * + * @mbggenerated + */ + public void setDepId(String depId) { + this.depId = depId == null ? null : depId.trim(); + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column contract_info.contract_name + * + * @return the value of contract_info.contract_name + * + * @mbggenerated + */ + public String getContractName() { + return contractName; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column contract_info.contract_name + * + * @param contractName the value for contract_info.contract_name + * + * @mbggenerated + */ + public void setContractName(String contractName) { + this.contractName = contractName == null ? null : contractName.trim(); + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column contract_info.pro_id + * + * @return the value of contract_info.pro_id + * + * @mbggenerated + */ + public String getProId() { + return proId; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column contract_info.pro_id + * + * @param proId the value for contract_info.pro_id + * + * @mbggenerated + */ + public void setProId(String proId) { + this.proId = proId == null ? null : proId.trim(); + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column contract_info.total amount + * + * @return the value of contract_info.total amount + * + * @mbggenerated + */ + public BigDecimal getTotalAmount() { + return totalAmount; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column contract_info.total amount + * + * @param totalAmount the value for contract_info.total amount + * + * @mbggenerated + */ + public void setTotalAmount(BigDecimal totalAmount) { + this.totalAmount = totalAmount; + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column contract_info.part_a + * + * @return the value of contract_info.part_a + * + * @mbggenerated + */ + public String getPartA() { + return partA; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column contract_info.part_a + * + * @param partA the value for contract_info.part_a + * + * @mbggenerated + */ + public void setPartA(String partA) { + this.partA = partA == null ? null : partA.trim(); + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column contract_info.part_b + * + * @return the value of contract_info.part_b + * + * @mbggenerated + */ + public String getPartB() { + return partB; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column contract_info.part_b + * + * @param partB the value for contract_info.part_b + * + * @mbggenerated + */ + public void setPartB(String partB) { + this.partB = partB == null ? null : partB.trim(); + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column contract_info.sign_time + * + * @return the value of contract_info.sign_time + * + * @mbggenerated + */ + public Date getSignTime() { + return signTime; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column contract_info.sign_time + * + * @param signTime the value for contract_info.sign_time + * + * @mbggenerated + */ + public void setSignTime(Date signTime) { + this.signTime = signTime; + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column contract_info.sign_addr + * + * @return the value of contract_info.sign_addr + * + * @mbggenerated + */ + public String getSignAddr() { + return signAddr; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column contract_info.sign_addr + * + * @param signAddr the value for contract_info.sign_addr + * + * @mbggenerated + */ + public void setSignAddr(String signAddr) { + this.signAddr = signAddr == null ? null : signAddr.trim(); + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column contract_info.begin_date + * + * @return the value of contract_info.begin_date + * + * @mbggenerated + */ + public Date getBeginDate() { + return beginDate; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column contract_info.begin_date + * + * @param beginDate the value for contract_info.begin_date + * + * @mbggenerated + */ + public void setBeginDate(Date beginDate) { + this.beginDate = beginDate; + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column contract_info.end_date + * + * @return the value of contract_info.end_date + * + * @mbggenerated + */ + public Date getEndDate() { + return endDate; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column contract_info.end_date + * + * @param endDate the value for contract_info.end_date + * + * @mbggenerated + */ + public void setEndDate(Date endDate) { + this.endDate = endDate; + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column contract_info.payment + * + * @return the value of contract_info.payment + * + * @mbggenerated + */ + public String getPayment() { + return payment; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column contract_info.payment + * + * @param payment the value for contract_info.payment + * + * @mbggenerated + */ + public void setPayment(String payment) { + this.payment = payment == null ? null : payment.trim(); + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column contract_info.note + * + * @return the value of contract_info.note + * + * @mbggenerated + */ + public String getNote() { + return note; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column contract_info.note + * + * @param note the value for contract_info.note + * + * @mbggenerated + */ + public void setNote(String note) { + this.note = note == null ? null : note.trim(); + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column contract_info.modify_person + * + * @return the value of contract_info.modify_person + * + * @mbggenerated + */ + public String getModifyPerson() { + return modifyPerson; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column contract_info.modify_person + * + * @param modifyPerson the value for contract_info.modify_person + * + * @mbggenerated + */ + public void setModifyPerson(String modifyPerson) { + this.modifyPerson = modifyPerson == null ? null : modifyPerson.trim(); + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column contract_info.modify_time + * + * @return the value of contract_info.modify_time + * + * @mbggenerated + */ + public Date getModifyTime() { + return modifyTime; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column contract_info.modify_time + * + * @param modifyTime the value for contract_info.modify_time + * + * @mbggenerated + */ + public void setModifyTime(Date modifyTime) { + this.modifyTime = modifyTime; + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column contract_info.del_flg + * + * @return the value of contract_info.del_flg + * + * @mbggenerated + */ + public String getDelFlg() { + return delFlg; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column contract_info.del_flg + * + * @param delFlg the value for contract_info.del_flg + * + * @mbggenerated + */ + public void setDelFlg(String delFlg) { + this.delFlg = delFlg == null ? null : delFlg.trim(); + } +} \ No newline at end of file diff --git a/src/main/java/com/soft/line/entity/MenuButtonInfo.java b/src/main/java/com/soft/line/entity/MenuButtonInfo.java new file mode 100644 index 0000000..a43c560 --- /dev/null +++ b/src/main/java/com/soft/line/entity/MenuButtonInfo.java @@ -0,0 +1,165 @@ +package com.soft.line.entity; + +import java.util.Date; + +public class MenuButtonInfo { + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column menu_button_info.id + * + * @mbggenerated + */ + private Integer id; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column menu_button_info.menu_id + * + * @mbggenerated + */ + private Integer menuId; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column menu_button_info.button_id + * + * @mbggenerated + */ + private String buttonId; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column menu_button_info.modify_person + * + * @mbggenerated + */ + private String modifyPerson; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column menu_button_info.modify_time + * + * @mbggenerated + */ + private Date modifyTime; + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column menu_button_info.id + * + * @return the value of menu_button_info.id + * + * @mbggenerated + */ + public Integer getId() { + return id; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column menu_button_info.id + * + * @param id the value for menu_button_info.id + * + * @mbggenerated + */ + public void setId(Integer id) { + this.id = id; + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column menu_button_info.menu_id + * + * @return the value of menu_button_info.menu_id + * + * @mbggenerated + */ + public Integer getMenuId() { + return menuId; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column menu_button_info.menu_id + * + * @param menuId the value for menu_button_info.menu_id + * + * @mbggenerated + */ + public void setMenuId(Integer menuId) { + this.menuId = menuId; + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column menu_button_info.button_id + * + * @return the value of menu_button_info.button_id + * + * @mbggenerated + */ + public String getButtonId() { + return buttonId; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column menu_button_info.button_id + * + * @param buttonId the value for menu_button_info.button_id + * + * @mbggenerated + */ + public void setButtonId(String buttonId) { + this.buttonId = buttonId == null ? null : buttonId.trim(); + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column menu_button_info.modify_person + * + * @return the value of menu_button_info.modify_person + * + * @mbggenerated + */ + public String getModifyPerson() { + return modifyPerson; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column menu_button_info.modify_person + * + * @param modifyPerson the value for menu_button_info.modify_person + * + * @mbggenerated + */ + public void setModifyPerson(String modifyPerson) { + this.modifyPerson = modifyPerson == null ? null : modifyPerson.trim(); + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column menu_button_info.modify_time + * + * @return the value of menu_button_info.modify_time + * + * @mbggenerated + */ + public Date getModifyTime() { + return modifyTime; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column menu_button_info.modify_time + * + * @param modifyTime the value for menu_button_info.modify_time + * + * @mbggenerated + */ + public void setModifyTime(Date modifyTime) { + this.modifyTime = modifyTime; + } +} \ No newline at end of file diff --git a/src/main/java/com/soft/line/entity/MenuInfo.java b/src/main/java/com/soft/line/entity/MenuInfo.java new file mode 100644 index 0000000..09eec48 --- /dev/null +++ b/src/main/java/com/soft/line/entity/MenuInfo.java @@ -0,0 +1,293 @@ +package com.soft.line.entity; + +import java.util.Date; + +public class MenuInfo { + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column menu_info.id + * + * @mbggenerated + */ + private Integer id; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column menu_info.menu_icon + * + * @mbggenerated + */ + private String menuIcon; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column menu_info.menu_name + * + * @mbggenerated + */ + private String menuName; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column menu_info.state + * + * @mbggenerated + */ + private Integer state; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column menu_info.menu_url + * + * @mbggenerated + */ + private String menuUrl; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column menu_info.oredby + * + * @mbggenerated + */ + private String oredby; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column menu_info.p_id + * + * @mbggenerated + */ + private Integer pId; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column menu_info.modify_person + * + * @mbggenerated + */ + private String modifyPerson; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column menu_info.modify_time + * + * @mbggenerated + */ + private Date modifyTime; + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column menu_info.id + * + * @return the value of menu_info.id + * + * @mbggenerated + */ + public Integer getId() { + return id; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column menu_info.id + * + * @param id the value for menu_info.id + * + * @mbggenerated + */ + public void setId(Integer id) { + this.id = id; + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column menu_info.menu_icon + * + * @return the value of menu_info.menu_icon + * + * @mbggenerated + */ + public String getMenuIcon() { + return menuIcon; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column menu_info.menu_icon + * + * @param menuIcon the value for menu_info.menu_icon + * + * @mbggenerated + */ + public void setMenuIcon(String menuIcon) { + this.menuIcon = menuIcon == null ? null : menuIcon.trim(); + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column menu_info.menu_name + * + * @return the value of menu_info.menu_name + * + * @mbggenerated + */ + public String getMenuName() { + return menuName; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column menu_info.menu_name + * + * @param menuName the value for menu_info.menu_name + * + * @mbggenerated + */ + public void setMenuName(String menuName) { + this.menuName = menuName == null ? null : menuName.trim(); + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column menu_info.state + * + * @return the value of menu_info.state + * + * @mbggenerated + */ + public Integer getState() { + return state; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column menu_info.state + * + * @param state the value for menu_info.state + * + * @mbggenerated + */ + public void setState(Integer state) { + this.state = state; + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column menu_info.menu_url + * + * @return the value of menu_info.menu_url + * + * @mbggenerated + */ + public String getMenuUrl() { + return menuUrl; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column menu_info.menu_url + * + * @param menuUrl the value for menu_info.menu_url + * + * @mbggenerated + */ + public void setMenuUrl(String menuUrl) { + this.menuUrl = menuUrl == null ? null : menuUrl.trim(); + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column menu_info.oredby + * + * @return the value of menu_info.oredby + * + * @mbggenerated + */ + public String getOredby() { + return oredby; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column menu_info.oredby + * + * @param oredby the value for menu_info.oredby + * + * @mbggenerated + */ + public void setOredby(String oredby) { + this.oredby = oredby == null ? null : oredby.trim(); + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column menu_info.p_id + * + * @return the value of menu_info.p_id + * + * @mbggenerated + */ + public Integer getpId() { + return pId; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column menu_info.p_id + * + * @param pId the value for menu_info.p_id + * + * @mbggenerated + */ + public void setpId(Integer pId) { + this.pId = pId; + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column menu_info.modify_person + * + * @return the value of menu_info.modify_person + * + * @mbggenerated + */ + public String getModifyPerson() { + return modifyPerson; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column menu_info.modify_person + * + * @param modifyPerson the value for menu_info.modify_person + * + * @mbggenerated + */ + public void setModifyPerson(String modifyPerson) { + this.modifyPerson = modifyPerson == null ? null : modifyPerson.trim(); + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column menu_info.modify_time + * + * @return the value of menu_info.modify_time + * + * @mbggenerated + */ + public Date getModifyTime() { + return modifyTime; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column menu_info.modify_time + * + * @param modifyTime the value for menu_info.modify_time + * + * @mbggenerated + */ + public void setModifyTime(Date modifyTime) { + this.modifyTime = modifyTime; + } +} \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/AttachmentInfoMapper.java b/src/main/java/com/soft/line/mapper/AttachmentInfoMapper.java new file mode 100644 index 0000000..7714ec3 --- /dev/null +++ b/src/main/java/com/soft/line/mapper/AttachmentInfoMapper.java @@ -0,0 +1,32 @@ +package com.soft.line.mapper; + + +import com.soft.line.entity.AttachmentInfo; + +import java.util.List; + +public interface AttachmentInfoMapper { + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table attachment_info + * + * @mbggenerated + */ + int insert(AttachmentInfo record); + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table attachment_info + * + * @mbggenerated + */ + AttachmentInfo selectByPrimaryKey(Integer id); + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table attachment_info + * + * @mbggenerated + */ + List selectAll(); +} \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/AttachmentInfoMapper.xml b/src/main/java/com/soft/line/mapper/AttachmentInfoMapper.xml new file mode 100644 index 0000000..99f884c --- /dev/null +++ b/src/main/java/com/soft/line/mapper/AttachmentInfoMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + insert into `attachment_info` (`attachment_name`, `attachement_url`, `modify_person`, + `modify_time`) + values (#{attachmentName,jdbcType=VARCHAR}, #{attachementUrl,jdbcType=VARCHAR}, #{modifyPerson,jdbcType=VARCHAR}, + #{modifyTime,jdbcType=TIMESTAMP}) + + + + \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/CertAttachInfoMapper.java b/src/main/java/com/soft/line/mapper/CertAttachInfoMapper.java new file mode 100644 index 0000000..ddfa1b8 --- /dev/null +++ b/src/main/java/com/soft/line/mapper/CertAttachInfoMapper.java @@ -0,0 +1,30 @@ +package com.soft.line.mapper; + +import com.soft.line.entity.CertAttachInfo; +import java.util.List; + +public interface CertAttachInfoMapper { + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table cert_attach_info + * + * @mbggenerated + */ + int insert(CertAttachInfo record); + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table cert_attach_info + * + * @mbggenerated + */ + CertAttachInfo selectByPrimaryKey(Integer id); + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table cert_attach_info + * + * @mbggenerated + */ + List selectAll(); +} \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/CertAttachInfoMapper.xml b/src/main/java/com/soft/line/mapper/CertAttachInfoMapper.xml new file mode 100644 index 0000000..36cbe97 --- /dev/null +++ b/src/main/java/com/soft/line/mapper/CertAttachInfoMapper.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + insert into `cert_attach_info` (`cert_id`, `attach_id`) + values (#{certId,jdbcType=INTEGER}, #{attachId,jdbcType=INTEGER}) + + + + \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/CodeDetailMapper.java b/src/main/java/com/soft/line/mapper/CodeDetailMapper.java new file mode 100644 index 0000000..b66574d --- /dev/null +++ b/src/main/java/com/soft/line/mapper/CodeDetailMapper.java @@ -0,0 +1,31 @@ +package com.soft.line.mapper; + +import com.soft.line.entity.CodeDetail; +import java.util.List; +import org.apache.ibatis.annotations.Param; + +public interface CodeDetailMapper { + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table code_detail + * + * @mbggenerated + */ + int insert(CodeDetail record); + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table code_detail + * + * @mbggenerated + */ + CodeDetail selectByPrimaryKey(@Param("codeType") String codeType, @Param("codeDetail") String codeDetail); + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table code_detail + * + * @mbggenerated + */ + List selectAll(); +} \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/CodeDetailMapper.xml b/src/main/java/com/soft/line/mapper/CodeDetailMapper.xml new file mode 100644 index 0000000..40cf5f5 --- /dev/null +++ b/src/main/java/com/soft/line/mapper/CodeDetailMapper.xml @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + insert into `code_detail` (`code_type`, `code_detail`, `code_content1`, + `code_content2`, `code_content3`, `code_content4`, + `orderby`, `note`) + values (#{codeType,jdbcType=VARCHAR}, #{codeDetail,jdbcType=VARCHAR}, #{codeContent1,jdbcType=VARCHAR}, + #{codeContent2,jdbcType=VARCHAR}, #{codeContent3,jdbcType=VARCHAR}, #{codeContent4,jdbcType=VARCHAR}, + #{orderby,jdbcType=INTEGER}, #{note,jdbcType=VARCHAR}) + + + + \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/ContractInfoMapper.java b/src/main/java/com/soft/line/mapper/ContractInfoMapper.java new file mode 100644 index 0000000..3181df4 --- /dev/null +++ b/src/main/java/com/soft/line/mapper/ContractInfoMapper.java @@ -0,0 +1,31 @@ +package com.soft.line.mapper; + +import com.soft.line.entity.ContractInfo; + +import java.util.List; + +public interface ContractInfoMapper { + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table contract_info + * + * @mbggenerated + */ + int insert(ContractInfo record); + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table contract_info + * + * @mbggenerated + */ + ContractInfo selectByPrimaryKey(Integer id); + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table contract_info + * + * @mbggenerated + */ + List selectAll(); +} \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml b/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml new file mode 100644 index 0000000..1857c6b --- /dev/null +++ b/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml @@ -0,0 +1,65 @@ + + + + + + + + + + + + + + + + + + + + + + + + + insert into `contract_info` (`dep_id`, `contract_name`, `pro_id`, + `total amount`, `part_a`, `part_b`, + `sign_time`, `sign_addr`, `begin_date`, + `end_date`, `payment`, `note`, + `modify_person`, `modify_time`, `del_flg` + ) + values (#{depId,jdbcType=VARCHAR}, #{contractName,jdbcType=VARCHAR}, #{proId,jdbcType=VARCHAR}, + #{totalAmount,jdbcType=DECIMAL}, #{partA,jdbcType=VARCHAR}, #{partB,jdbcType=VARCHAR}, + #{signTime,jdbcType=TIMESTAMP}, #{signAddr,jdbcType=VARCHAR}, #{beginDate,jdbcType=TIMESTAMP}, + #{endDate,jdbcType=TIMESTAMP}, #{payment,jdbcType=VARCHAR}, #{note,jdbcType=VARCHAR}, + #{modifyPerson,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}, #{delFlg,jdbcType=CHAR} + ) + + + + \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/MenuButtonInfoMapper.java b/src/main/java/com/soft/line/mapper/MenuButtonInfoMapper.java new file mode 100644 index 0000000..d29d13f --- /dev/null +++ b/src/main/java/com/soft/line/mapper/MenuButtonInfoMapper.java @@ -0,0 +1,30 @@ +package com.soft.line.mapper; + +import com.soft.line.entity.MenuButtonInfo; +import java.util.List; + +public interface MenuButtonInfoMapper { + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table menu_button_info + * + * @mbggenerated + */ + int insert(MenuButtonInfo record); + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table menu_button_info + * + * @mbggenerated + */ + MenuButtonInfo selectByPrimaryKey(Integer id); + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table menu_button_info + * + * @mbggenerated + */ + List selectAll(); +} \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/MenuButtonInfoMapper.xml b/src/main/java/com/soft/line/mapper/MenuButtonInfoMapper.xml new file mode 100644 index 0000000..d9c78dd --- /dev/null +++ b/src/main/java/com/soft/line/mapper/MenuButtonInfoMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + insert into `menu_button_info` (`menu_id`, `button_id`, `modify_person`, + `modify_time`) + values (#{menuId,jdbcType=INTEGER}, #{buttonId,jdbcType=VARCHAR}, #{modifyPerson,jdbcType=VARCHAR}, + #{modifyTime,jdbcType=TIMESTAMP}) + + + + \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/MenuInfoMapper.java b/src/main/java/com/soft/line/mapper/MenuInfoMapper.java new file mode 100644 index 0000000..6951ab3 --- /dev/null +++ b/src/main/java/com/soft/line/mapper/MenuInfoMapper.java @@ -0,0 +1,30 @@ +package com.soft.line.mapper; + +import com.soft.line.entity.MenuInfo; +import java.util.List; + +public interface MenuInfoMapper { + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table menu_info + * + * @mbggenerated + */ + int insert(MenuInfo record); + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table menu_info + * + * @mbggenerated + */ + MenuInfo selectByPrimaryKey(Integer id); + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table menu_info + * + * @mbggenerated + */ + List selectAll(); +} \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/MenuInfoMapper.xml b/src/main/java/com/soft/line/mapper/MenuInfoMapper.xml new file mode 100644 index 0000000..c78be14 --- /dev/null +++ b/src/main/java/com/soft/line/mapper/MenuInfoMapper.xml @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + insert into `menu_info` (`menu_icon`, `menu_name`, `state`, + `menu_url`, `oredby`, `p_id`, + `modify_person`, `modify_time`) + values (#{menuIcon,jdbcType=VARCHAR}, #{menuName,jdbcType=VARCHAR}, #{state,jdbcType=INTEGER}, + #{menuUrl,jdbcType=VARCHAR}, #{oredby,jdbcType=VARCHAR}, #{pId,jdbcType=INTEGER}, + #{modifyPerson,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}) + + + + \ No newline at end of file diff --git a/src/main/java/com/soft/line/service/CertificateInfoService.java b/src/main/java/com/soft/line/service/CertificateInfoService.java index 64f94f1..aef943c 100644 --- a/src/main/java/com/soft/line/service/CertificateInfoService.java +++ b/src/main/java/com/soft/line/service/CertificateInfoService.java @@ -2,10 +2,6 @@ package com.soft.line.service; import com.github.pagehelper.PageInfo; import com.soft.line.entity.CertificateInfo; -import com.soft.line.mapper.CertificateInfoMapper; -import com.soft.line.util.pagehelper.PageBeans; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; import java.util.List; import java.util.Map; diff --git a/src/main/java/com/soft/line/service/impl/CertificateInfoServiceImpl.java b/src/main/java/com/soft/line/service/impl/CertificateInfoServiceImpl.java index b83fca9..36fa98c 100644 --- a/src/main/java/com/soft/line/service/impl/CertificateInfoServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/CertificateInfoServiceImpl.java @@ -1,11 +1,9 @@ package com.soft.line.service.impl; -import com.github.pagehelper.Page; import com.github.pagehelper.PageInfo; import com.soft.line.entity.CertificateInfo; import com.soft.line.mapper.CertificateInfoMapper; import com.soft.line.service.CertificateInfoService; -import com.soft.line.util.pagehelper.PageBeans; import com.soft.line.util.pagehelper.PageUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -- Gitee From bc4da827a7dc9ea5f41bcba0ac2996bb6dca4e9f Mon Sep 17 00:00:00 2001 From: wuxueqiao <17625808004@163.com> Date: Thu, 21 May 2020 15:04:56 +0800 Subject: [PATCH 023/211] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=9D=83=E9=99=90?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ContractInfoController.java | 29 ++++++++++++++++ .../line/controller/MenuInfoController.java | 29 ++++++++++++++++ .../soft/line/mapper/ContractInfoMapper.java | 4 +++ .../soft/line/mapper/ContractInfoMapper.xml | 10 ++++++ .../com/soft/line/mapper/MenuInfoMapper.java | 3 ++ .../com/soft/line/mapper/MenuInfoMapper.xml | 20 +++++++++++ .../line/service/ContractInfoService.java | 19 +++++++++++ .../soft/line/service/MenuInfoService.java | 15 ++++++++ .../service/impl/ContractInfoServiceImpl.java | 34 +++++++++++++++++++ .../service/impl/MenuInfoServiceImpl.java | 27 +++++++++++++++ 10 files changed, 190 insertions(+) create mode 100644 src/main/java/com/soft/line/controller/ContractInfoController.java create mode 100644 src/main/java/com/soft/line/controller/MenuInfoController.java create mode 100644 src/main/java/com/soft/line/service/ContractInfoService.java create mode 100644 src/main/java/com/soft/line/service/MenuInfoService.java create mode 100644 src/main/java/com/soft/line/service/impl/ContractInfoServiceImpl.java create mode 100644 src/main/java/com/soft/line/service/impl/MenuInfoServiceImpl.java diff --git a/src/main/java/com/soft/line/controller/ContractInfoController.java b/src/main/java/com/soft/line/controller/ContractInfoController.java new file mode 100644 index 0000000..9d98642 --- /dev/null +++ b/src/main/java/com/soft/line/controller/ContractInfoController.java @@ -0,0 +1,29 @@ +package com.soft.line.controller; + +import com.soft.line.service.ContractInfoService; +import com.soft.line.util.exception.CommonResult; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.Map; + +/** + * @Description 合同相关 + * @author wu.xueqiao on 2020/5/21. + * @version 0.1 + */ +@RequestMapping("/contract") +@RestController +public class ContractInfoController { + + @Autowired + private ContractInfoService contractInfoService; + + @PostMapping + public CommonResult getAllAboutContracts(@RequestBody Map map){ + return CommonResult.success(contractInfoService.getAllAboutContracts(map)); + } +} diff --git a/src/main/java/com/soft/line/controller/MenuInfoController.java b/src/main/java/com/soft/line/controller/MenuInfoController.java new file mode 100644 index 0000000..fbdf0cd --- /dev/null +++ b/src/main/java/com/soft/line/controller/MenuInfoController.java @@ -0,0 +1,29 @@ +package com.soft.line.controller; + +import com.soft.line.service.MenuInfoService; +import com.soft.line.util.exception.CommonResult; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.Map; + +/** + * @Description 根据相应的角色获取菜单按钮权限 + * @author wu.xueqiao on 2020/5/21. + * @version 0.1 + */ +@RequestMapping("/menu") +@RestController +public class MenuInfoController { + + @Autowired + private MenuInfoService menuInfoService; + + @PostMapping("/getMyMenus") + public CommonResult getAllMenuForRole(@RequestBody Map map){ + return CommonResult.success(menuInfoService.getAllMenuForRole(map)); + } +} diff --git a/src/main/java/com/soft/line/mapper/ContractInfoMapper.java b/src/main/java/com/soft/line/mapper/ContractInfoMapper.java index 3181df4..0730b7b 100644 --- a/src/main/java/com/soft/line/mapper/ContractInfoMapper.java +++ b/src/main/java/com/soft/line/mapper/ContractInfoMapper.java @@ -3,6 +3,7 @@ package com.soft.line.mapper; import com.soft.line.entity.ContractInfo; import java.util.List; +import java.util.Map; public interface ContractInfoMapper { /** @@ -28,4 +29,7 @@ public interface ContractInfoMapper { * @mbggenerated */ List selectAll(); + + + List getAllAboutContracts(Map map); } \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml b/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml index 1857c6b..29abbfa 100644 --- a/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml +++ b/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml @@ -62,4 +62,14 @@ `modify_time`, `del_flg` from `contract_info` + \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/MenuInfoMapper.java b/src/main/java/com/soft/line/mapper/MenuInfoMapper.java index 6951ab3..91e33d1 100644 --- a/src/main/java/com/soft/line/mapper/MenuInfoMapper.java +++ b/src/main/java/com/soft/line/mapper/MenuInfoMapper.java @@ -2,6 +2,7 @@ package com.soft.line.mapper; import com.soft.line.entity.MenuInfo; import java.util.List; +import java.util.Map; public interface MenuInfoMapper { /** @@ -27,4 +28,6 @@ public interface MenuInfoMapper { * @mbggenerated */ List selectAll(); + + List getAllMenuForRole(Map map); } \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/MenuInfoMapper.xml b/src/main/java/com/soft/line/mapper/MenuInfoMapper.xml index c78be14..fdd5169 100644 --- a/src/main/java/com/soft/line/mapper/MenuInfoMapper.xml +++ b/src/main/java/com/soft/line/mapper/MenuInfoMapper.xml @@ -47,4 +47,24 @@ `modify_time` from `menu_info` + + + \ No newline at end of file diff --git a/src/main/java/com/soft/line/service/ContractInfoService.java b/src/main/java/com/soft/line/service/ContractInfoService.java new file mode 100644 index 0000000..8500a53 --- /dev/null +++ b/src/main/java/com/soft/line/service/ContractInfoService.java @@ -0,0 +1,19 @@ +package com.soft.line.service; + +import com.github.pagehelper.PageInfo; +import com.soft.line.entity.ContractInfo; +import com.soft.line.entity.MenuInfo; + +import java.util.List; +import java.util.Map; + +/** + * @author wu.xueqiao on 2020/5/21. + * @version 0.1 + */ +public interface ContractInfoService { + + + public PageInfo getAllAboutContracts(Map map); + +} diff --git a/src/main/java/com/soft/line/service/MenuInfoService.java b/src/main/java/com/soft/line/service/MenuInfoService.java new file mode 100644 index 0000000..470e69a --- /dev/null +++ b/src/main/java/com/soft/line/service/MenuInfoService.java @@ -0,0 +1,15 @@ +package com.soft.line.service; + +import com.soft.line.entity.MenuInfo; + +import java.util.List; +import java.util.Map; + +/** + * @author wu.xueqiao on 2020/5/21. + * @version 0.1 + */ +public interface MenuInfoService { + + public List getAllMenuForRole(Map map); +} diff --git a/src/main/java/com/soft/line/service/impl/ContractInfoServiceImpl.java b/src/main/java/com/soft/line/service/impl/ContractInfoServiceImpl.java new file mode 100644 index 0000000..23cde55 --- /dev/null +++ b/src/main/java/com/soft/line/service/impl/ContractInfoServiceImpl.java @@ -0,0 +1,34 @@ +package com.soft.line.service.impl; + +import com.github.pagehelper.PageInfo; +import com.soft.line.entity.ContractInfo; +import com.soft.line.mapper.ContractInfoMapper; +import com.soft.line.service.ContractInfoService; +import com.soft.line.util.pagehelper.PageUtil; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Map; + +/** + * @author wu.xueqiao on 2020/5/21. + * @version 0.1 + */ +@Service +@Slf4j +public class ContractInfoServiceImpl implements ContractInfoService{ + @Autowired + private ContractInfoMapper contractInfoMapper; + + + @Override + public PageInfo getAllAboutContracts(Map map) { + PageUtil.setPageParam(map); + List certificateInfos=contractInfoMapper.getAllAboutContracts(map); + PageInfo beans = new PageInfo(certificateInfos); + beans.setList(certificateInfos); + return beans; + } +} diff --git a/src/main/java/com/soft/line/service/impl/MenuInfoServiceImpl.java b/src/main/java/com/soft/line/service/impl/MenuInfoServiceImpl.java new file mode 100644 index 0000000..849021c --- /dev/null +++ b/src/main/java/com/soft/line/service/impl/MenuInfoServiceImpl.java @@ -0,0 +1,27 @@ +package com.soft.line.service.impl; + +import com.soft.line.entity.MenuInfo; +import com.soft.line.mapper.MenuInfoMapper; +import com.soft.line.service.MenuInfoService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Map; + +/** + * @author wu.xueqiao on 2020/5/21. + * @version 0.1 + */ +@Service +@Slf4j +public class MenuInfoServiceImpl implements MenuInfoService { + + @Autowired + private MenuInfoMapper menuInfoMapper; + @Override + public List getAllMenuForRole(Map map) { + return menuInfoMapper.getAllMenuForRole(map); + } +} -- Gitee From e04a73dd9990fb1abff8b59be9b5786f6bb234d1 Mon Sep 17 00:00:00 2001 From: ljc Date: Thu, 21 May 2020 17:18:37 +0800 Subject: [PATCH 024/211] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E6=8F=92=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../soft/line/controller/MenuController.java | 18 +-- .../service/{impl => }/MenuInfoService.java | 6 +- .../{ => impl}/MenuInfoServiceImpl.java | 14 +- .../line/util/config/PageHelperConfig.java | 14 -- .../soft/line/util/pagehelper/PageBeans.java | 81 +++++++++++ .../soft/line/util/pagehelper/PageUtil.java | 43 ++++++ src/main/resources/api/API.json | 131 ++++++++++++++++++ 7 files changed, 278 insertions(+), 29 deletions(-) rename src/main/java/com/soft/line/service/{impl => }/MenuInfoService.java (56%) rename src/main/java/com/soft/line/service/{ => impl}/MenuInfoServiceImpl.java (61%) delete mode 100644 src/main/java/com/soft/line/util/config/PageHelperConfig.java create mode 100644 src/main/java/com/soft/line/util/pagehelper/PageBeans.java create mode 100644 src/main/java/com/soft/line/util/pagehelper/PageUtil.java create mode 100644 src/main/resources/api/API.json diff --git a/src/main/java/com/soft/line/controller/MenuController.java b/src/main/java/com/soft/line/controller/MenuController.java index 9afb9e0..9cc1dbb 100644 --- a/src/main/java/com/soft/line/controller/MenuController.java +++ b/src/main/java/com/soft/line/controller/MenuController.java @@ -1,10 +1,10 @@ package com.soft.line.controller; -import com.soft.line.entity.CertificateInfo; +import com.github.pagehelper.PageInfo; import com.soft.line.entity.MenuButtonInfo; import com.soft.line.entity.MenuInfo; import com.soft.line.service.CodeDetailService; -import com.soft.line.service.impl.MenuInfoService; +import com.soft.line.service.MenuInfoService; import com.soft.line.util.exception.CommonResult; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -12,10 +12,10 @@ import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.ui.Model; import org.springframework.web.bind.annotation.*; import java.util.List; +import java.util.Map; @Api(value = "菜单接口") @Slf4j @@ -27,17 +27,17 @@ public class MenuController { @Autowired private CodeDetailService codeDetailService; - @RequestMapping("/menus") - public CommonResult> getAllMenus() { - //System.out.println(codeDetailService.selectContent1ByPrimaryKey("4","3")); - return CommonResult.success(menuInfoService.selectAll()); + @GetMapping("/systemAdmin/menus") + @ApiOperation(value = "查询所有菜单列表") + public CommonResult> getAllMenus(@RequestBody Map map) { + return CommonResult.success(menuInfoService.selectAll(map)); } - @ApiOperation(value = "菜单按钮列表", notes = "菜单按钮列表") + @ApiOperation(value = "菜单按钮列表") @ApiImplicitParams({ @ApiImplicitParam(name = "menuId", value = "菜单ID", required = true, dataType = "Integer", paramType = "path") }) - @GetMapping("menu/{menuId}") + @GetMapping("systemAdmin/menus/{menuId}") public CommonResult> getCertificateInfoByID(@PathVariable("menuId") Integer menuId) { return CommonResult.success(menuInfoService.selectAllByMenuId(menuId)); } diff --git a/src/main/java/com/soft/line/service/impl/MenuInfoService.java b/src/main/java/com/soft/line/service/MenuInfoService.java similarity index 56% rename from src/main/java/com/soft/line/service/impl/MenuInfoService.java rename to src/main/java/com/soft/line/service/MenuInfoService.java index 6d56686..8b5270d 100644 --- a/src/main/java/com/soft/line/service/impl/MenuInfoService.java +++ b/src/main/java/com/soft/line/service/MenuInfoService.java @@ -1,13 +1,15 @@ -package com.soft.line.service.impl; +package com.soft.line.service; +import com.github.pagehelper.PageInfo; import com.soft.line.entity.MenuButtonInfo; import com.soft.line.entity.MenuInfo; import java.util.List; +import java.util.Map; public interface MenuInfoService { - public List selectAll(); + public PageInfo selectAll(final Map map); public List selectAllByMenuId(Integer menuId); } diff --git a/src/main/java/com/soft/line/service/MenuInfoServiceImpl.java b/src/main/java/com/soft/line/service/impl/MenuInfoServiceImpl.java similarity index 61% rename from src/main/java/com/soft/line/service/MenuInfoServiceImpl.java rename to src/main/java/com/soft/line/service/impl/MenuInfoServiceImpl.java index b8d4c80..2300125 100644 --- a/src/main/java/com/soft/line/service/MenuInfoServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/MenuInfoServiceImpl.java @@ -1,15 +1,18 @@ -package com.soft.line.service; +package com.soft.line.service.impl; +import com.github.pagehelper.PageInfo; import com.soft.line.entity.MenuButtonInfo; import com.soft.line.entity.MenuInfo; import com.soft.line.mapper.MenuButtonInfoMapper; import com.soft.line.mapper.MenuInfoMapper; -import com.soft.line.service.impl.MenuInfoService; +import com.soft.line.service.MenuInfoService; +import com.soft.line.util.pagehelper.PageUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; +import java.util.Map; @Service @Slf4j @@ -21,8 +24,11 @@ public class MenuInfoServiceImpl implements MenuInfoService { private MenuButtonInfoMapper menuButtonInfoMapper; @Override - public List selectAll() { - return menuInfoMapper.selectAll(); + public PageInfo selectAll(final Map map) { + PageUtil.setPageParam(map); + List menuInfoList = menuInfoMapper.selectAll(); + PageInfo menuInfoPage =new PageInfo(menuInfoList); + return menuInfoPage; } @Override diff --git a/src/main/java/com/soft/line/util/config/PageHelperConfig.java b/src/main/java/com/soft/line/util/config/PageHelperConfig.java deleted file mode 100644 index e7a24b7..0000000 --- a/src/main/java/com/soft/line/util/config/PageHelperConfig.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.soft.line.util.config; - -import com.github.pagehelper.PageHelper; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -@Configuration -public class PageHelperConfig { - @Bean - public PageHelper createPaeHelper(){ - PageHelper page= new PageHelper(); - return page; - } -} diff --git a/src/main/java/com/soft/line/util/pagehelper/PageBeans.java b/src/main/java/com/soft/line/util/pagehelper/PageBeans.java new file mode 100644 index 0000000..4f4b510 --- /dev/null +++ b/src/main/java/com/soft/line/util/pagehelper/PageBeans.java @@ -0,0 +1,81 @@ +package com.soft.line.util.pagehelper; + +import com.github.pagehelper.Page; + +import java.io.Serializable; +import java.util.List; + +public class PageBeans implements Serializable { + private static final long serialVersionUID = 6545455108462881123L; + private long total; //总记录数 + private List list; //结果集 + private int pageNum; // 第几页 + private int pageSize; // 每页记录数 + private int pages; // 总页数 + private int size; // 当前页的数量 <= pageSize，该属性来自ArrayList的size属性 + + /** + * 包装Page对象，因为直接返回Page对象. + * @param list page结果 + */ + public PageBeans(List list) { + if (list instanceof Page) { + Page page = (Page) list; + this.pageNum = page.getPageNum(); + this.pageSize = page.getPageSize(); + this.total = page.getTotal(); + this.pages = page.getPages(); + this.list = page; + this.size = page.size(); + } + } + + public long getTotal() { + return total; + } + + public void setTotal(long total) { + this.total = total; + } + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + + public int getPageNum() { + return pageNum; + } + + public void setPageNum(int pageNum) { + this.pageNum = pageNum; + } + + public int getPageSize() { + return pageSize; + } + + public void setPageSize(int pageSize) { + this.pageSize = pageSize; + } + + public int getPages() { + return pages; + } + + public void setPages(int pages) { + this.pages = pages; + } + + public int getSize() { + return size; + } + + public void setSize(int size) { + this.size = size; + } + +} diff --git a/src/main/java/com/soft/line/util/pagehelper/PageUtil.java b/src/main/java/com/soft/line/util/pagehelper/PageUtil.java new file mode 100644 index 0000000..de4a3da --- /dev/null +++ b/src/main/java/com/soft/line/util/pagehelper/PageUtil.java @@ -0,0 +1,43 @@ +package com.soft.line.util.pagehelper; + +import com.github.pagehelper.Page; +import com.github.pagehelper.PageHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.Map; + + +public class PageUtil { + private static final transient Logger LOG = LoggerFactory.getLogger(PageUtil.class); + /** + * set page. + * + * @param paramMap + * + * @return page info. + */ + public static Page> setPageParam(final Map paramMap) { + int pageNum = 1; + int pageSize = 10; + final Object pageNumO = paramMap.get("pageNum"); + final Object pageSizeO = paramMap.get("pageSize"); + if (null != pageNumO) { + pageNum = Integer.parseInt(pageNumO.toString()); + } + + if (null != pageSizeO) { + pageSize = Integer.parseInt(pageSizeO.toString()); + } + + if (paramMap.containsKey("pageNum")) { + pageNum = Integer.parseInt(paramMap.get("pageNum").toString()); + } + + if (paramMap.containsKey("pageSize")) { + pageSize = Integer.parseInt(paramMap.get("pageSize").toString()); + } + final Page> page = PageHelper.startPage(pageNum, pageSize); + return page; + } +} diff --git a/src/main/resources/api/API.json b/src/main/resources/api/API.json new file mode 100644 index 0000000..ecd6caf --- /dev/null +++ b/src/main/resources/api/API.json @@ -0,0 +1,131 @@ +{ + "common": [ + { + "url": "/codeDetail", + "method": "get", + "desc": "获取codeDetail", + "params": { + "codeType": "" + }, + "response": [{ + "CodeDetail": "Bean" + }] + }, { + "url": "/pageMenu", + "method": "get", + "desc": "获取所有在前端有页面的菜单", + "params": { + }, + "response": { + "data": "返回所有有按钮的菜单(子菜单)，和该页面包含的按钮列表" + } + }, { + "url": "/roleNames", + "method": "get", + "desc": "获取所有角色名称", + "params": { + }, + "response": { + "data": [ + { + "id": "1", + "roleName": "管理员" + } + ] + } + } + ], + "登录": [ + { + "url": "/auth/login", + "method": "post", + "desc": "登录", + "params": { + "userName": "", + "password": "" + } + }, { + "url": "/auth/logout", + "method": "post", + "desc": "登出", + "params": {} + }, { + "url": "/auth/userInfo", + "method": "get", + "desc": "获取登录用户有权限的页面和页面上的按钮", + "params": { + "userId": "" + }, + "response": { + "userInfo": { + "menuList": [{ + "buttonList": [{ + + }] + }] + } + } + } + ], + "用户管理": [ + { + "url": "/systemAdmin/accounts", + "method": "get", + "desc": "查询用户列表", + "params": { + "pageNo": 1, + "pageSize": 10, + "userName": "", + "roleId": "", + "status": "" + }, + "response": { + "data": [], + "pageSize": 10, + "pageNo": 0, + "totalPage": 1, + "totalCount": 2 + } + } + ], + "角色管理": [ + { + "url": "/systemAdmin/roles", + "method": "get", + "desc": "查询角色列表", + "params": { + "pageNo": 1, + "pageSize": 10, + "roleName": "", + "status": "" + }, + "response": { + "data": [], + "pageSize": 10, + "pageNo": 0, + "totalPage": 1, + "totalCount": 2 + } + } + ], + "菜单管理": [ + { + "url": "/systemAdmin/menus", + "method": "get", + "desc": "查询所有菜单列表", + "params": { + "pageNo": 1, + "pageSize": 10, + "menuName": "", + "menuUrl": "" + }, + "response": { + "data": [], + "pageSize": 10, + "pageNo": 0, + "totalPage": 1, + "totalCount": 2 + } + } + ] +} -- Gitee From 615668dfd258dade06180d1581337fbd6da63011 Mon Sep 17 00:00:00 2001 From: ljc <1119265069@qq.com> Date: Fri, 22 May 2020 00:28:12 +0800 Subject: [PATCH 025/211] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=8F=9C=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/soft/line/entity/MenuInfo.java | 11 +++++++++++ .../soft/line/service/impl/MenuInfoServiceImpl.java | 3 +++ 2 files changed, 14 insertions(+) diff --git a/src/main/java/com/soft/line/entity/MenuInfo.java b/src/main/java/com/soft/line/entity/MenuInfo.java index 09eec48..8f91835 100644 --- a/src/main/java/com/soft/line/entity/MenuInfo.java +++ b/src/main/java/com/soft/line/entity/MenuInfo.java @@ -1,6 +1,7 @@ package com.soft.line.entity; import java.util.Date; +import java.util.List; public class MenuInfo { /** @@ -75,6 +76,8 @@ public class MenuInfo { */ private Date modifyTime; + private List menuButtonInfoList; + /** * This method was generated by MyBatis Generator. * This method returns the value of the database column menu_info.id @@ -290,4 +293,12 @@ public class MenuInfo { public void setModifyTime(Date modifyTime) { this.modifyTime = modifyTime; } + + public List getMenuButtonInfoList() { + return menuButtonInfoList; + } + + public void setMenuButtonInfoList(List menuButtonInfoList) { + this.menuButtonInfoList = menuButtonInfoList; + } } \ No newline at end of file diff --git a/src/main/java/com/soft/line/service/impl/MenuInfoServiceImpl.java b/src/main/java/com/soft/line/service/impl/MenuInfoServiceImpl.java index 2300125..507c0d6 100644 --- a/src/main/java/com/soft/line/service/impl/MenuInfoServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/MenuInfoServiceImpl.java @@ -27,6 +27,9 @@ public class MenuInfoServiceImpl implements MenuInfoService { public PageInfo selectAll(final Map map) { PageUtil.setPageParam(map); List menuInfoList = menuInfoMapper.selectAll(); + for (MenuInfo mi:menuInfoList) { + mi.setMenuButtonInfoList(selectAllByMenuId(mi.getId())); + } PageInfo menuInfoPage =new PageInfo(menuInfoList); return menuInfoPage; } -- Gitee From a4ee1da06e52b110a1d60dc037d96e80260b281a Mon Sep 17 00:00:00 2001 From: ljc Date: Fri, 22 May 2020 15:26:31 +0800 Subject: [PATCH 026/211] =?UTF-8?q?=E9=85=8D=E7=BD=AEbutton?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../line/controller/ButtonController.java | 29 ++++ .../line/controller/CodeDetailController.java | 35 +++++ .../soft/line/controller/MenuController.java | 8 + .../java/com/soft/line/entity/ButtonInfo.java | 32 ++++ .../soft/line/filter/ConfigurationFilter.java | 148 ++++++++++++++++++ .../GlobalApplicationContextHolder.java | 71 +++++++++ .../java/com/soft/line/filter/GsonUtil.java | 18 +++ .../com/soft/line/filter/HttpRequestUtil.java | 52 ++++++ .../com/soft/line/filter/ResponseWrapper.java | 84 ++++++++++ .../java/com/soft/line/filter/StatusCode.java | 63 ++++++++ src/main/java/com/soft/line/filter/Token.java | 55 +++++++ .../com/soft/line/filter/UserTokenDto.java | 14 ++ .../soft/line/mapper/ButtonInfoMapper.java | 14 ++ .../com/soft/line/mapper/ButtonInfoMapper.xml | 15 ++ .../soft/line/mapper/CodeDetailMapper.java | 2 + .../com/soft/line/mapper/CodeDetailMapper.xml | 8 + .../soft/line/service/ButtonInfoService.java | 14 ++ .../soft/line/service/CodeDetailService.java | 4 + .../service/impl/ButtonInfoServiceImpl.java | 23 +++ .../service/impl/CodeDetailServiceImpl.java | 7 + 20 files changed, 696 insertions(+) create mode 100644 src/main/java/com/soft/line/controller/ButtonController.java create mode 100644 src/main/java/com/soft/line/controller/CodeDetailController.java create mode 100644 src/main/java/com/soft/line/entity/ButtonInfo.java create mode 100644 src/main/java/com/soft/line/filter/ConfigurationFilter.java create mode 100644 src/main/java/com/soft/line/filter/GlobalApplicationContextHolder.java create mode 100644 src/main/java/com/soft/line/filter/GsonUtil.java create mode 100644 src/main/java/com/soft/line/filter/HttpRequestUtil.java create mode 100644 src/main/java/com/soft/line/filter/ResponseWrapper.java create mode 100644 src/main/java/com/soft/line/filter/StatusCode.java create mode 100644 src/main/java/com/soft/line/filter/Token.java create mode 100644 src/main/java/com/soft/line/filter/UserTokenDto.java create mode 100644 src/main/java/com/soft/line/mapper/ButtonInfoMapper.java create mode 100644 src/main/java/com/soft/line/mapper/ButtonInfoMapper.xml create mode 100644 src/main/java/com/soft/line/service/ButtonInfoService.java create mode 100644 src/main/java/com/soft/line/service/impl/ButtonInfoServiceImpl.java diff --git a/src/main/java/com/soft/line/controller/ButtonController.java b/src/main/java/com/soft/line/controller/ButtonController.java new file mode 100644 index 0000000..cc4386c --- /dev/null +++ b/src/main/java/com/soft/line/controller/ButtonController.java @@ -0,0 +1,29 @@ +package com.soft.line.controller; + +import com.soft.line.entity.ButtonInfo; +import com.soft.line.service.ButtonInfoService; +import com.soft.line.util.exception.CommonResult; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +@Api(value = "按钮接口") +@Slf4j +@RestController +public class ButtonController { + + @Autowired + private ButtonInfoService buttonInfoService; + + @GetMapping("/buttons") + @ApiOperation(value = "查询所有菜单列表") + public CommonResult> getAllButtons() { + return CommonResult.success(buttonInfoService.selectAll()); + } + +} diff --git a/src/main/java/com/soft/line/controller/CodeDetailController.java b/src/main/java/com/soft/line/controller/CodeDetailController.java new file mode 100644 index 0000000..360e9e4 --- /dev/null +++ b/src/main/java/com/soft/line/controller/CodeDetailController.java @@ -0,0 +1,35 @@ +package com.soft.line.controller; + +import com.soft.line.entity.CodeDetail; +import com.soft.line.entity.MenuButtonInfo; +import com.soft.line.service.CodeDetailService; +import com.soft.line.util.exception.CommonResult; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +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.RestController; + +import java.util.List; + +@Api(value = "内部代码") +@Slf4j +@RestController +public class CodeDetailController { + + @Autowired + private CodeDetailService codeDetailService; + + @ApiOperation(value = "菜单按钮列表") + @ApiImplicitParams({ + @ApiImplicitParam(name = "codeType", value = "codeType", required = true, dataType = "String", paramType = "path") + }) + @GetMapping("codeDetail/{codeType}") + public CommonResult> getCodeDetailByCodeType(@PathVariable("codeType") String codeType) { + return CommonResult.success(codeDetailService.selectByCodeType(codeType)); + } +} diff --git a/src/main/java/com/soft/line/controller/MenuController.java b/src/main/java/com/soft/line/controller/MenuController.java index 9cc1dbb..0521d17 100644 --- a/src/main/java/com/soft/line/controller/MenuController.java +++ b/src/main/java/com/soft/line/controller/MenuController.java @@ -42,4 +42,12 @@ public class MenuController { return CommonResult.success(menuInfoService.selectAllByMenuId(menuId)); } + /*@ApiOperation(value = "菜单按钮列表") + @GetMapping("systemAdmin/menus/addupdatemenu") + public CommonResult addMenu(@RequestBody Map map) { + + + return CommonResult.success(menuInfoService.selectAll(map) ); + }*/ + } diff --git a/src/main/java/com/soft/line/entity/ButtonInfo.java b/src/main/java/com/soft/line/entity/ButtonInfo.java new file mode 100644 index 0000000..f1d81ee --- /dev/null +++ b/src/main/java/com/soft/line/entity/ButtonInfo.java @@ -0,0 +1,32 @@ +package com.soft.line.entity; + +public class ButtonInfo { + + private String buttonId; + private String buttonName; + private String buttonType; + + public String getButtonId() { + return buttonId; + } + + public void setButtonId(String buttonId) { + this.buttonId = buttonId; + } + + public String getButtonName() { + return buttonName; + } + + public void setButtonName(String buttonName) { + this.buttonName = buttonName; + } + + public String getButtonType() { + return buttonType; + } + + public void setButtonType(String buttonType) { + this.buttonType = buttonType; + } +} diff --git a/src/main/java/com/soft/line/filter/ConfigurationFilter.java b/src/main/java/com/soft/line/filter/ConfigurationFilter.java new file mode 100644 index 0000000..5036bdc --- /dev/null +++ b/src/main/java/com/soft/line/filter/ConfigurationFilter.java @@ -0,0 +1,148 @@ +package com.soft.line.filter; + +import com.google.gson.Gson; +import org.apache.catalina.filters.RemoteIpFilter; +import org.springframework.boot.web.servlet.FilterRegistrationBean; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.http.converter.HttpMessageConverter; +import org.springframework.http.converter.StringHttpMessageConverter; + +import javax.servlet.*; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.nio.charset.Charset; + + +/** + * @author wu.xueqiao on 2020/5/12. + * @version 0.1 + */ +@Configuration +public class ConfigurationFilter { + @Bean + public HttpMessageConverter responseBodyConverter() { + StringHttpMessageConverter converter = new StringHttpMessageConverter( + Charset.forName("UTF-8")); + return converter; + } + + @Bean + public RemoteIpFilter remoteIpFilter() { + return new RemoteIpFilter(); + } + + @Bean + public FilterRegistrationBean testFilterRegistration() { + FilterRegistrationBean registration = new FilterRegistrationBean(); + registration.setFilter(new MyFilter()); + registration.addUrlPatterns("/*"); + registration.addInitParameter("name", "value"); + registration.setName("MyFilter"); + registration.setOrder(1); + return registration; + } + + public class MyFilter implements Filter { + @Override + public void destroy() { + } + + @Override + public void doFilter(final ServletRequest servletRequest, final ServletResponse servletResponse, + final FilterChain chain) + throws IOException, ServletException { + + final Gson gson = new Gson(); + //final ResultData rd = new ResultData(); + final ResponseWrapper responseWrapper=new ResponseWrapper(); + final HttpServletRequest request = (HttpServletRequest) servletRequest; + final HttpServletResponse response = (HttpServletResponse) servletResponse; + response.setHeader("Access-Control-Allow-Origin", "*"); + response.setHeader("Access-Control-Allow-Methods", "POST,GET,PUT,OPTIONS,DELETE"); + response.setHeader("Access-Control-Max-Age", "3600"); + response.setHeader("Access-Control-Allow-Headers", "Origin,X-Requested-With,Content-Type,Accept,Authorization,token"); + final String uri = request.getRequestURI(); + String auth = request.getHeader("Authorization"); + Token token = null; + if (!uri.contains("/login")) { + if (auth == null || "".equals(auth)) { + if (uri.contains("/file/download/")) { + auth = request.getParameter("token"); + if (auth == null || "".equals(auth)) { + response.setContentType("application/json"); + response.setCharacterEncoding("UTF-8"); + //rd.setMsg("Authentication Failed: Require Authorization"); + responseWrapper.failure(StatusCode.SC_10000.val(),"Authentication Failed: Require Authorization"); + //rd.setStatus("10000"); + final String write = gson.toJson(responseWrapper); + response.getWriter().write(write); + return; + } + } else { + response.setContentType("application/json"); + response.setCharacterEncoding("UTF-8"); + //rd.setMsg("Authentication Failed: Require Authorization"); + responseWrapper.failure(StatusCode.SC_10000.val(),"Authentication Failed: Require Authorization"); + //rd.setStatus("10000"); + final String write = gson.toJson(responseWrapper); + response.getWriter().write(write); + return; + } + } + token = new Token(auth); + if (token.getErr() == Token.ExpiredJwtError) { + response.setContentType("application/json"); + response.setCharacterEncoding("UTF-8"); + //rd.setMsg("Authentication Failed: 认证过期"); + responseWrapper.failure(StatusCode.SC_10001.val(),"Authentication Failed: 认证过期"); + // rd.setStatus("10000"); + final String write = gson.toJson(responseWrapper); + response.getWriter().write(write); + return; + } + if (token.getErr() == Token.SignatureError) { + response.setContentType("application/json"); + response.setCharacterEncoding("UTF-8"); + //rd.setMsg("Authentication Failed: 非法认证"); + responseWrapper.failure(StatusCode.SC_10002.val(),"Authentication Failed: 非法认证"); + + //rd.setStatus("10000"); + final String write = gson.toJson(responseWrapper); + response.getWriter().write(write); + return; + } + if (HttpRequestUtil.REDIS_SERVICE.getKeyValue(token.getUsername()) == null + || "".equals(HttpRequestUtil.REDIS_SERVICE.getKeyValue(token.getUsername()))) { + response.setContentType("application/json"); + response.setCharacterEncoding("UTF-8"); + //rd.setMsg("会话过期，请重新登录"); + responseWrapper.failure(StatusCode.SC_10003.val(),"会话过期，请重新登录"); + //rd.setStatus("10000"); + final String write = gson.toJson(responseWrapper); + response.getWriter().write(write); + return; + } + HttpRequestUtil.REDIS_SERVICE.setKeyTimeout(token.getUsername(), HttpRequestUtil.expire); + } + try { + chain.doFilter(request, response); + } catch (final Exception e) { + System.out.println(e.toString()); + response.setContentType("application/json"); + response.setCharacterEncoding("UTF-8"); + //rd.setMsg("服务器异常"); + responseWrapper.failure(StatusCode.SC_500.val(),"请求失败"); + //rd.setStatus("10001"); + final String write = gson.toJson(responseWrapper); + response.getWriter().write(write); + return; + } + } + + @Override + public void init(FilterConfig arg0) throws ServletException { + } + } +} \ No newline at end of file diff --git a/src/main/java/com/soft/line/filter/GlobalApplicationContextHolder.java b/src/main/java/com/soft/line/filter/GlobalApplicationContextHolder.java new file mode 100644 index 0000000..b855667 --- /dev/null +++ b/src/main/java/com/soft/line/filter/GlobalApplicationContextHolder.java @@ -0,0 +1,71 @@ +package com.soft.line.filter; + +import org.springframework.context.ApplicationContext; +import org.springframework.context.ApplicationContextAware; +import org.springframework.stereotype.Component; + +import java.util.Map; + +@Component +public class GlobalApplicationContextHolder implements ApplicationContextAware { + + private static ApplicationContext context; + + /** + *

because the ApplicationContextAware interface is implemented,

+ *

when it is configured as bean, it will automatically injecting ApplicationContext.

+ */ + @Override + public void setApplicationContext(final ApplicationContext applicationContext) { + setAppContext(applicationContext); + } + + /** + * provide a static method for setting up ApplicationContext. + * + * @param applicationContext + */ + public static void setAppContext(final ApplicationContext applicationContext) { + context = applicationContext; + } + + /** + * static method to obtain ApplicationContext + * + * @return + */ + public static ApplicationContext getApplicationContext() { + return context; + } + + /** + * get bean based on the bean name. + * + * @param name + * + * @return + */ + public static Object getBean(final String name) { + return getApplicationContext().getBean(name); + } + + /** + * get bean (generic) according to Class. + * + * @param clazz + * @return + */ + public static T getBean(final Class clazz) { + return getApplicationContext().getBean(clazz); + } + + /** + * get all the bean to implement an interface based on Class. + * + * @param clazz + * @return + */ + public static Map getBeansOfType(final Class clazz) { + return getApplicationContext().getBeansOfType(clazz); + } +} diff --git a/src/main/java/com/soft/line/filter/GsonUtil.java b/src/main/java/com/soft/line/filter/GsonUtil.java new file mode 100644 index 0000000..0c1b8db --- /dev/null +++ b/src/main/java/com/soft/line/filter/GsonUtil.java @@ -0,0 +1,18 @@ +package com.soft.line.filter; + +import com.google.gson.Gson; + + +public class GsonUtil { + public static String javabeanToJson(final UserTokenDto user) { + final Gson gson = new Gson(); + final String json = gson.toJson(user); + return json; + } + + public static UserTokenDto jsonToJavaBean(final String json) { + final Gson gson = new Gson(); + final UserTokenDto user = gson.fromJson(json, UserTokenDto.class); + return user; + } +} diff --git a/src/main/java/com/soft/line/filter/HttpRequestUtil.java b/src/main/java/com/soft/line/filter/HttpRequestUtil.java new file mode 100644 index 0000000..5a8d1b4 --- /dev/null +++ b/src/main/java/com/soft/line/filter/HttpRequestUtil.java @@ -0,0 +1,52 @@ +package com.soft.line.filter; + + +import com.soft.line.util.redis.RedisClient; +import org.springframework.web.context.request.RequestAttributes; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; + +import javax.servlet.http.HttpServletRequest; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.Map; + + +public class HttpRequestUtil { + public static final RedisClient REDIS_SERVICE = (RedisClient) GlobalApplicationContextHolder.getApplicationContext() + .getBean("redisClient"); + + + public static final String key = "SOFTLINE-BUILD"; + + public static final Integer expire = 315360000; + + public static UserTokenDto getUserToken() { + + final RequestAttributes ra = RequestContextHolder.getRequestAttributes(); + final ServletRequestAttributes sra = (ServletRequestAttributes) ra; + final HttpServletRequest request = sra.getRequest(); + final Map map = getHeadersInfo(request); + String token = map.get("authorization"); + if (token == null || "".equals(token)) { + token = request.getParameter("token"); + } + final Token tokenInfo = new Token(token); + String json = null; + + json = REDIS_SERVICE.getKeyValue(tokenInfo.getUsername()); + + return GsonUtil.jsonToJavaBean(json); + } + + private static Map getHeadersInfo(final HttpServletRequest request) { + final Map map = new HashMap(); + final Enumeration headerNames = request.getHeaderNames(); + while (headerNames.hasMoreElements()) { + final String key = headerNames.nextElement(); + final String value = request.getHeader(key); + map.put(key, value); + } + return map; + } +} diff --git a/src/main/java/com/soft/line/filter/ResponseWrapper.java b/src/main/java/com/soft/line/filter/ResponseWrapper.java new file mode 100644 index 0000000..e3ca08d --- /dev/null +++ b/src/main/java/com/soft/line/filter/ResponseWrapper.java @@ -0,0 +1,84 @@ +package com.soft.line.filter; + + + +import java.io.Serializable; +import java.util.HashMap; +import java.util.Map; + + +public class ResponseWrapper implements Serializable { + + private static final String OK = "OK"; + private static final String ERROR = "Error"; + private static final String BOOL_RES_KEY = "result"; + private ResponseWrapper.Meta meta; + private Object data; + + public ResponseWrapper() { + } + + public ResponseWrapper success(String code) { + return this.success(code, new HashMap(0)); + } + + public ResponseWrapper success(String code, Object data) { + this.meta = new ResponseWrapper.Meta(code, "OK"); + this.data = data != null ? data : new HashMap(0); + return this; + } + + public static ResponseWrapper successRespForBool(boolean result) { + ResponseWrapper dr = new ResponseWrapper(); + Map res = new HashMap(); + res.put("result", result); + dr.success(StatusCode.SC_200.val(), res); + return dr; + } + + public static ResponseWrapper successRespForVoid() { + ResponseWrapper dr = new ResponseWrapper(); + dr.success(StatusCode.SC_200.val()); + return dr; + } + + public ResponseWrapper failure(String code) { + return this.failure(code, "Error"); + } + + public ResponseWrapper failure(String code, String message) { + this.meta = new ResponseWrapper.Meta(code, message); + this.data = new HashMap(0); + return this; + } + + public ResponseWrapper.Meta getMeta() { + return this.meta; + } + + public Object getData() { + return this.data; + } + + public static class Meta implements Serializable { + private String code; + private String message; + + public Meta(String code) { + this(code, ""); + } + + public Meta(String code, String message) { + this.code = code; + this.message = message; + } + + public String getCode() { + return this.code; + } + + public String getMessage() { + return this.message; + } + } +} diff --git a/src/main/java/com/soft/line/filter/StatusCode.java b/src/main/java/com/soft/line/filter/StatusCode.java new file mode 100644 index 0000000..afad865 --- /dev/null +++ b/src/main/java/com/soft/line/filter/StatusCode.java @@ -0,0 +1,63 @@ +package com.soft.line.filter; + +public enum StatusCode { + + SC_200("SC_200"), + SC_201("SC_201"), + SC_400("SC_400"), + SC_401("SC_401"), + SC_404("SC_404"), + SC_405("SC_405"), + SC_422("SC_422"), + SC_500("SC_500"), + SC_10000("SC_10000"), + SC_10001("SC_10001"), + SC_10002("SC_10002"), + SC_10004("SC_10004"), + SC_10003("SC_10003"); + + + + private String code; + + private StatusCode(String code) { + this.code = code; + } + + public String val() { + return this.code; + } + + public static StatusCode valueOf(int code) { + switch (code) { + case 200: + return SC_200; + case 201: + return SC_201; + case 400: + return SC_400; + case 401: + return SC_401; + case 404: + return SC_404; + case 405: + return SC_405; + case 422: + return SC_422; + case 500: + return SC_500; + case 10000: + return SC_10000; + case 10001: + return SC_10001; + case 10002: + return SC_10002; + case 10003: + return SC_10003; + case 10004: + return SC_10004; + default: + return SC_500; + } + } +} diff --git a/src/main/java/com/soft/line/filter/Token.java b/src/main/java/com/soft/line/filter/Token.java new file mode 100644 index 0000000..2a9b14b --- /dev/null +++ b/src/main/java/com/soft/line/filter/Token.java @@ -0,0 +1,55 @@ +package com.soft.line.filter; + +import io.jsonwebtoken.*; + +/** + * @author wu.xueqiao on 2020/5/12. + * @version 0.1 + */ +public class Token { + + private String account; + + private String username; + + + + private int err = 0; + + public static final int ExpiredJwtError = 1; + + public static final int SignatureError = 2; + + public Token(final String token) { + try { + JwtParser jwtParser = Jwts.parser().setSigningKey(HttpRequestUtil.key); + Jws claimsJws = jwtParser.parseClaimsJws(token); + Claims body = claimsJws.getBody(); + final Claims claims = Jwts.parser().setSigningKey(HttpRequestUtil.key).parseClaimsJws(token).getBody(); + + this.username = claims.get("username").toString(); + } catch (final ExpiredJwtException e) { + this.err = ExpiredJwtError; + } catch (final SignatureException e) { + this.err = SignatureError; + } + } + + public String getAccount() { + + return account; + } + + + public String getUsername() { + + return username; + } + + + public int getErr() { + + return err; + } + +} diff --git a/src/main/java/com/soft/line/filter/UserTokenDto.java b/src/main/java/com/soft/line/filter/UserTokenDto.java new file mode 100644 index 0000000..9e10a6e --- /dev/null +++ b/src/main/java/com/soft/line/filter/UserTokenDto.java @@ -0,0 +1,14 @@ +package com.soft.line.filter; + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class UserTokenDto implements Serializable { + private String userName; + private String password; + + private String token; + +} diff --git a/src/main/java/com/soft/line/mapper/ButtonInfoMapper.java b/src/main/java/com/soft/line/mapper/ButtonInfoMapper.java new file mode 100644 index 0000000..4008645 --- /dev/null +++ b/src/main/java/com/soft/line/mapper/ButtonInfoMapper.java @@ -0,0 +1,14 @@ +package com.soft.line.mapper; + +import com.soft.line.entity.ButtonInfo; +import com.soft.line.entity.CodeDetail; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + +public interface ButtonInfoMapper { + + List selectAll(); + +} \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/ButtonInfoMapper.xml b/src/main/java/com/soft/line/mapper/ButtonInfoMapper.xml new file mode 100644 index 0000000..6283095 --- /dev/null +++ b/src/main/java/com/soft/line/mapper/ButtonInfoMapper.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/CodeDetailMapper.java b/src/main/java/com/soft/line/mapper/CodeDetailMapper.java index afcbb89..716fb2c 100644 --- a/src/main/java/com/soft/line/mapper/CodeDetailMapper.java +++ b/src/main/java/com/soft/line/mapper/CodeDetailMapper.java @@ -32,4 +32,6 @@ public interface CodeDetailMapper { * @mbggenerated */ List selectAll(); + + List selectByCodeType(@Param("codeType") String codeType); } \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/CodeDetailMapper.xml b/src/main/java/com/soft/line/mapper/CodeDetailMapper.xml index c940737..bd9056c 100644 --- a/src/main/java/com/soft/line/mapper/CodeDetailMapper.xml +++ b/src/main/java/com/soft/line/mapper/CodeDetailMapper.xml @@ -36,5 +36,13 @@ from `code_detail` + + + \ No newline at end of file diff --git a/src/main/java/com/soft/line/service/ButtonInfoService.java b/src/main/java/com/soft/line/service/ButtonInfoService.java new file mode 100644 index 0000000..91955e9 --- /dev/null +++ b/src/main/java/com/soft/line/service/ButtonInfoService.java @@ -0,0 +1,14 @@ +package com.soft.line.service; + +import com.github.pagehelper.PageInfo; +import com.soft.line.entity.ButtonInfo; +import com.soft.line.entity.MenuButtonInfo; +import com.soft.line.entity.MenuInfo; + +import java.util.List; +import java.util.Map; + +public interface ButtonInfoService { + + public List selectAll(); +} diff --git a/src/main/java/com/soft/line/service/CodeDetailService.java b/src/main/java/com/soft/line/service/CodeDetailService.java index 6659ad9..f6c9aec 100644 --- a/src/main/java/com/soft/line/service/CodeDetailService.java +++ b/src/main/java/com/soft/line/service/CodeDetailService.java @@ -2,9 +2,13 @@ package com.soft.line.service; import com.soft.line.entity.CodeDetail; +import java.util.List; + public interface CodeDetailService { public CodeDetail selectByPrimaryKey(String codeType, String codeDetail); public String selectContent1ByPrimaryKey(String codeType, String codeDetail); + + public List selectByCodeType(String codeType); } diff --git a/src/main/java/com/soft/line/service/impl/ButtonInfoServiceImpl.java b/src/main/java/com/soft/line/service/impl/ButtonInfoServiceImpl.java new file mode 100644 index 0000000..10e14df --- /dev/null +++ b/src/main/java/com/soft/line/service/impl/ButtonInfoServiceImpl.java @@ -0,0 +1,23 @@ +package com.soft.line.service.impl; + +import com.soft.line.entity.ButtonInfo; +import com.soft.line.mapper.ButtonInfoMapper; +import com.soft.line.service.ButtonInfoService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +@Slf4j +public class ButtonInfoServiceImpl implements ButtonInfoService { + + @Autowired + private ButtonInfoMapper buttonInfoMapper; + + @Override + public List selectAll() { + return buttonInfoMapper.selectAll(); + } +} diff --git a/src/main/java/com/soft/line/service/impl/CodeDetailServiceImpl.java b/src/main/java/com/soft/line/service/impl/CodeDetailServiceImpl.java index 79848c6..3bd9458 100644 --- a/src/main/java/com/soft/line/service/impl/CodeDetailServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/CodeDetailServiceImpl.java @@ -7,6 +7,8 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; + @Service @Slf4j public class CodeDetailServiceImpl implements CodeDetailService { @@ -22,4 +24,9 @@ public class CodeDetailServiceImpl implements CodeDetailService { public String selectContent1ByPrimaryKey(String codeType, String codeDetail) { return codeDetailMapper.selectContent1ByPrimaryKey(codeType,codeDetail); } + + @Override + public List selectByCodeType(String codeType) { + return codeDetailMapper.selectByCodeType(codeType); + } } -- Gitee From 40483f03f212f0c46ccca054ccf5506a688e615e Mon Sep 17 00:00:00 2001 From: ljc Date: Fri, 22 May 2020 15:45:21 +0800 Subject: [PATCH 027/211] =?UTF-8?q?=E9=85=8D=E7=BD=AEbutton?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 148 +++++-- softline-files-manage.iml | 97 ++-- .../java/com/soft/line/aop/Permission.java | 14 + .../com/soft/line/aop/PermissionAspect.java | 43 ++ .../soft/line/util/redis/JedisProperties.java | 71 +++ .../com/soft/line/util/redis/RedisClient.java | 419 ++++++++++++++++++ .../com/soft/line/util/redis/RedisConfig.java | 47 ++ 7 files changed, 769 insertions(+), 70 deletions(-) create mode 100644 src/main/java/com/soft/line/aop/Permission.java create mode 100644 src/main/java/com/soft/line/aop/PermissionAspect.java create mode 100644 src/main/java/com/soft/line/util/redis/JedisProperties.java create mode 100644 src/main/java/com/soft/line/util/redis/RedisClient.java create mode 100644 src/main/java/com/soft/line/util/redis/RedisConfig.java diff --git a/pom.xml b/pom.xml index 57106b3..f4f2d24 100644 --- a/pom.xml +++ b/pom.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.springframework.boot @@ -89,45 +89,54 @@ commons-text ${apache.commons-text.version} - - org.projectlombok lombok 1.18.12 - - - - - org.springframework.boot - spring-boot-devtools - + + org.springframework.boot + spring-boot-devtools + + io.springfox springfox-swagger2 - 2.5.0 + 2.8.0 - io.springfox springfox-swagger-ui - 2.5.0 + 2.8.0 + + + + io.github.swagger2markup + swagger2markup + 1.3.1 + + + ca.szc.thirdparty.nl.jworks.markdown_to_asciidoc + markdown_to_asciidoc + 1.0 + + + org.pegdown + pegdown + 1.6.0 + test + org.springframework.boot spring-boot-starter-aop - + com.alibaba druid @@ -139,40 +148,111 @@ 1.2.17 - - com.github.pagehelper - pagehelper-spring-boot-starter - 1.2.10 + com.google.code.gson + gson + 2.8.0 + + + org.json + json + 20090211 - - io.jsonwebtoken jjwt 0.6.0 - - org.springframework.boot - spring-boot-starter-data-redis + redis.clients + jedis + 2.9.0 + - + - org.springframework.boot - spring-boot-starter-cache + com.github.pagehelper + pagehelper-spring-boot-starter + 1.2.5 - + + + io.github.swagger2markup + swagger2markup-maven-plugin + 1.3.1 + + + http://localhost:9100/softline/v2/api-docs + src/docs/asciidoc/generated + + + ASCIIDOC + + + + + + org.asciidoctor + asciidoctor-maven-plugin + 1.5.3 + + + + org.asciidoctor + asciidoctorj-pdf + 1.5.0-alpha.11 + + + org.jruby + jruby-complete + 1.7.21 + + + + + src/docs/asciidoc/generated + coderay + + left + + + + + + output-html + generate-resources + + process-asciidoc + + + html5 + src/docs/asciidoc/html + + + + output-pdf + generate-resources + + process-asciidoc + + + pdf + src/docs/asciidoc/pdf + + + + + org.springframework.boot spring-boot-maven-plugin - 2.1.2.RELEASE org.mybatis.generator @@ -203,14 +283,12 @@ + src/main/java **/*.xml - - src/main/resources - diff --git a/softline-files-manage.iml b/softline-files-manage.iml index dfebf7b..2a0be0c 100644 --- a/softline-files-manage.iml +++ b/softline-files-manage.iml @@ -34,10 +34,11 @@ - + + @@ -66,7 +67,6 @@ - @@ -81,7 +81,7 @@ - + @@ -103,50 +103,77 @@ - - - + + + - - - - - - + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + - - - - - - - - - - - - - - - - - + + + + + \ No newline at end of file diff --git a/src/main/java/com/soft/line/aop/Permission.java b/src/main/java/com/soft/line/aop/Permission.java new file mode 100644 index 0000000..f45eaa7 --- /dev/null +++ b/src/main/java/com/soft/line/aop/Permission.java @@ -0,0 +1,14 @@ +package com.soft.line.aop; + +import java.lang.annotation.*; + +/** + * @author wu.xueqiao on 2020/5/12. + * @version 0.1 + * @Description 定义用户访问权限 Permission + */ +@Target( ElementType.METHOD ) +@Retention( RetentionPolicy.RUNTIME ) +@Documented +public @interface Permission { +} diff --git a/src/main/java/com/soft/line/aop/PermissionAspect.java b/src/main/java/com/soft/line/aop/PermissionAspect.java new file mode 100644 index 0000000..56ee45e --- /dev/null +++ b/src/main/java/com/soft/line/aop/PermissionAspect.java @@ -0,0 +1,43 @@ +package com.soft.line.aop; + +import com.soft.line.filter.HttpRequestUtil; +import com.soft.line.filter.UserTokenDto; +import lombok.extern.slf4j.Slf4j; +import org.aspectj.lang.ProceedingJoinPoint; +import org.aspectj.lang.annotation.Around; +import org.aspectj.lang.annotation.Aspect; +import org.springframework.stereotype.Component; +import org.springframework.web.bind.annotation.ResponseBody; + +/** + * @author wu.xueqiao on 2020/5/12. + * @version 0.1 + */ + +@Aspect +@Slf4j +@Component +@ResponseBody +public class PermissionAspect { + + + + //环绕通知 + @Around(value="@annotation(permission)") + public void checkPermission(ProceedingJoinPoint joinPoint, Permission permission) throws Throwable{ + //获取请求session中的人员信息，判断人员所具有的权限，权限符合则继续，不符合则抛出相关提醒； + log.info("------开始校验权限------"); + //获取请求参数 + Object[] objects= joinPoint.getArgs(); + log.info("---"+objects[0]+"----"); + //获取请求客户端的个人信息 + UserTokenDto userToken= HttpRequestUtil.getUserToken(); + //根据角色,编辑业务逻辑。。。。。 + if(objects[0].equals("www")){ + + } + + + } + +} diff --git a/src/main/java/com/soft/line/util/redis/JedisProperties.java b/src/main/java/com/soft/line/util/redis/JedisProperties.java new file mode 100644 index 0000000..e2fbee7 --- /dev/null +++ b/src/main/java/com/soft/line/util/redis/JedisProperties.java @@ -0,0 +1,71 @@ +package com.soft.line.util.redis; + + +import org.springframework.boot.context.properties.ConfigurationProperties; + +@ConfigurationProperties(prefix = JedisProperties.JEDIS_PREFIX) +public class JedisProperties { + + public static final String JEDIS_PREFIX = "spring.jedis"; + + private String host; + + private int port; + + private String uri; + + private int maxTotal; + + private int maxIdle; + + private int maxWaitMillis; + + public String getHost() { + return host; + } + + public void setHost(String host) { + this.host = host; + } + + public int getPort() { + return port; + } + + public void setPort(int port) { + this.port = port; + } + + public String getUri() { + return uri; + } + + public void setUri(String uri) { + this.uri = uri; + } + + public int getMaxTotal() { + return maxTotal; + } + + public void setMaxTotal(int maxTotal) { + this.maxTotal = maxTotal; + } + + public int getMaxIdle() { + return maxIdle; + } + + public void setMaxIdle(int maxIdle) { + this.maxIdle = maxIdle; + } + + public int getMaxWaitMillis() { + return maxWaitMillis; + } + + public void setMaxWaitMillis(int maxWaitMillis) { + this.maxWaitMillis = maxWaitMillis; + } + +} \ No newline at end of file diff --git a/src/main/java/com/soft/line/util/redis/RedisClient.java b/src/main/java/com/soft/line/util/redis/RedisClient.java new file mode 100644 index 0000000..8d7d99e --- /dev/null +++ b/src/main/java/com/soft/line/util/redis/RedisClient.java @@ -0,0 +1,419 @@ +package com.soft.line.util.redis; + +import org.slf4j.LoggerFactory; +import redis.clients.jedis.*; +import redis.clients.jedis.exceptions.JedisException; + +import java.util.ArrayList; +import java.util.List; +import java.util.Set; + + +public class RedisClient { + + private ShardedJedisPool pool; + + private JedisPool jpool; + + private static org.slf4j.Logger logger = LoggerFactory.getLogger(RedisClient.class); + + public void setShardedJedisPool(ShardedJedisPool pool) { + + this.pool = pool; + } + public void setJedisPool(JedisPool jpool) { + + this.jpool = jpool; + } + + /** + * Get ShardedJedis (lock mechanism, high concurrency) + */ + public synchronized ShardedJedis getJedis() { + ShardedJedis jedis = null; + try { + if (pool != null) { + jedis = pool.getResource(); + return jedis; + } + } catch (final Exception e) { + logger.error("Get jedis error : " + e); + } + return null; + } + public synchronized Jedis jgetJedis() { + Jedis jedis = null; + try { + if (jpool != null) { + jedis = jpool.getResource(); + return jedis; + } + } catch (final Exception e) { + logger.error("Get jedis error : " + e); + } + return null; + } + /** + * the ordered set adds or updates the scores of the existing members. + * @param key + * @param score + * @param member + * + * @return boolean + */ + public boolean zaddSorted(final String key, final Integer score, final String member) { + final ShardedJedis jedis = getJedis(); + try { + return jedis.zadd(key, score, member) > 0L; + + } catch (final Exception e) { + } finally { + if (jedis != null) { + jedis.close(); + } + } + return false; + } + + /** + * an ordered set of values (in terms of fractions). + * @param key + * @param score + * + * @return object + */ + public Object getSorted(final String key, final Integer score) { + + final ShardedJedis jedis = getJedis(); + try { + final Set memberSet = jedis.zrevrange(key, 0, score); + return memberSet; + } catch (final Exception e) { + } finally { + if (jedis != null) { + jedis.close(); + } + } + return null; + } + + /** + * increase acquisition of correlation key words by ordered set. + * @param key + * @param fuzzy + * @param size + * + * @return object + */ + public Object getMatchMember(final String key, final String fuzzy, final int size) { + final ShardedJedis jedis = getJedis(); + try { + + final ScanParams scanParams = new ScanParams(); + scanParams.count(size); + scanParams.match("*" + fuzzy + "*"); + final ScanResult memberSet = jedis.zscan(key, "", scanParams); + return memberSet; + } catch (final Exception e) { + } finally { + if (jedis != null) { + jedis.close(); + } + } + return null; + + } + + /** + * increase the score of an ordered set of a certain value. + * @param key + * @param score + * @param member + * + * @return boolean + */ + public boolean incrbySocre(final String key, final Integer score, final String member) { + final ShardedJedis jedis = getJedis(); + try { + return jedis.zincrby(key, score, member) > 0l; + + } catch (final Exception e) { + } finally { + if (jedis != null) { + jedis.close(); + } + } + return false; + } + + /** + * add key value pairs in the specified domain + * @param value + * @param key + * @param field + * + * @return boolean + */ + public boolean set(final Object value, final String key, final String field) { + + final ShardedJedis jedis = getJedis(); + try { + return jedis.hset(key, field, value.toString()) > 0l; + } catch (final JedisException e) { + logger.error(e.getMessage()); + } finally { + if (jedis != null) { + jedis.close(); + } + } + return false; + } + + public boolean delList(final String key) { + final ShardedJedis jedis = getJedis(); + try { + return jedis.del(key.getBytes()) > 0l; + } catch (final JedisException e) { + logger.error(e.getMessage()); + } finally { + if (jedis != null) { + jedis.close(); + } + } + return false; + } + + public boolean del(final String key) { + final ShardedJedis jedis = getJedis(); + try { + return jedis.del(key) > 0l; + } catch (final JedisException e) { + logger.error(e.getMessage()); + } finally { + if (jedis != null) { + jedis.close(); + } + } + return false; + } + + public void dels(final String key) { + final Jedis jedis = jgetJedis(); + try { +// Set set = jedis.keys(key+"*"); +// for (String akey : set) { +// jedis.del(akey); +// } + jedis.select(8); + Set set = jedis.keys(key+":*"); + for (String akey : set) { + jedis.del(akey); + } + } catch (final JedisException e) { + logger.error(e.getMessage()); + } finally { + if (jedis != null) { + jedis.close(); + } + } + } + + public boolean listSet(final String key, final List value) { + final ShardedJedis jedis = getJedis(); + try { + for (final String code : value) { + jedis.rpush(key.getBytes(), code.getBytes()); + } + return true; + } catch (final JedisException e) { + logger.error(e.getMessage()); + } finally { + if (jedis != null) { + jedis.close(); + } + } + return false; + } + + public List hasApp(final String key) { + final ShardedJedis jedis = getJedis(); + try { + return jedis.lrange(key, 0, -1); + } catch (final JedisException e) { + logger.error(e.getMessage()); + } finally { + if (jedis != null) { + jedis.close(); + } + } + return null; + } + + /** + * get the value of the corresponding key in the specified domain. + * @param key + * @param field + * + * @return Object + */ + public Object get(final String key, final String field) { + + final ShardedJedis jedis = getJedis(); + try { + + if (jedis.hget(key, field) == null) { + return null; + } + final Object value = jedis.hget(key, field); + return value.toString(); + } catch (final JedisException e) { + logger.error(e.getMessage()); + return null; + } finally { + if (jedis != null) { + jedis.close(); + } + } + } + + /** + * delete key value pairs in the specified key name hash table. + * @param key + * @param field + * + * @return boolean + */ + public boolean del(final String key, final String field) { + + final ShardedJedis jedis = getJedis(); + try { + return jedis.hdel(key, field) > 0; + } catch (final JedisException e) { + logger.error(e.getMessage()); + } finally { + if (jedis != null) { + jedis.close(); + } + } + return false; + } + + /** + * delete all key value pairs in the specified key key + * @param key + * + * @return boolean + */ + public boolean mdel(final String key) { + + final ShardedJedis jedis = getJedis(); + try { + final List keys = scan(key); + if (keys != null) { + for (final String k : keys) { + del(key, k); + } + return true; + } else { + return false; + } + } catch (final JedisException e) { + logger.error(e.getMessage()); + } finally { + if (jedis != null) { + jedis.close(); + } + } + return false; + } + + /** + * Get all keys in the specified key name hash table. + * @param key + * + * @return List + */ + public List scan(final String key) { + + final ShardedJedis jedis = getJedis(); + try { + final List list = new ArrayList(); + list.addAll(jedis.hkeys(key)); + return list; + } catch (final JedisException e) { + logger.error(e.getMessage()); + } finally { + if (jedis != null) { + jedis.close(); + } + } + return null; + } + + /** + * set value by key、value、seconds + * + * @param key + * @param value + * @param seconds + */ + public Boolean setKeyValue(final String key, final String value, final Integer seconds) { + + final ShardedJedis jedis = getJedis(); + try { + String tt = jedis.set(key, value); + if ("OK".equals(jedis.set(key, value))) { + jedis.expire(key, seconds); + return true; + } + } catch (final JedisException e) { + logger.error(e.getMessage()); + } finally { + if (jedis != null) { + jedis.close(); + } + } + return false; + } + + /** + * get value by key + * + * @param key + */ + public String getKeyValue(final String key) { + + final ShardedJedis jedis = getJedis(); + try { + return jedis.get(key); + } catch (final JedisException e) { + logger.error(e.getMessage()); + } finally { + if (jedis != null) { + jedis.close(); + } + } + return null; + } + + /** + * set outTime + * + * @param key + * @param seconds + */ + public Boolean setKeyTimeout(final String key, final Integer seconds) { + + final ShardedJedis jedis = getJedis(); + try { + return jedis.expire(key, seconds) == 1L; + } catch (final JedisException e) { + logger.error(e.getMessage()); + } finally { + if (jedis != null) { + jedis.close(); + } + } + return false; + } +} diff --git a/src/main/java/com/soft/line/util/redis/RedisConfig.java b/src/main/java/com/soft/line/util/redis/RedisConfig.java new file mode 100644 index 0000000..d24f3ce --- /dev/null +++ b/src/main/java/com/soft/line/util/redis/RedisConfig.java @@ -0,0 +1,47 @@ +package com.soft.line.util.redis; + + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; +import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import redis.clients.jedis.JedisPoolConfig; +import redis.clients.jedis.JedisShardInfo; +import redis.clients.jedis.ShardedJedisPool; + +import java.util.ArrayList; +import java.util.List; + + +@Configuration +@EnableAutoConfiguration +@EnableConfigurationProperties(JedisProperties.class) +@ConditionalOnClass(RedisClient.class) +public class RedisConfig { + @Autowired + private JedisProperties prop; + + @Bean(name="shardedJedisPool") + public ShardedJedisPool shardedJedisPool() { + JedisPoolConfig config = new JedisPoolConfig(); + config.setMaxTotal(prop.getMaxTotal()); + config.setMaxIdle(prop.getMaxIdle()); + config.setMaxWaitMillis(prop.getMaxWaitMillis()); + List jedisShardInfoList = new ArrayList<>(); + jedisShardInfoList.add(new JedisShardInfo(prop.getUri())); + ShardedJedisPool shardedJedisPool = new ShardedJedisPool(config, jedisShardInfoList); + return shardedJedisPool; + } + + @Bean + @ConditionalOnMissingBean(RedisClient.class) + public RedisClient redisClient(@Qualifier("shardedJedisPool")ShardedJedisPool shardedJedisPool) { + RedisClient redisClient = new RedisClient(); + redisClient.setShardedJedisPool(shardedJedisPool); + return redisClient; + } +} -- Gitee From 295c349132fbfa5393232059db8e6a04f5257767 Mon Sep 17 00:00:00 2001 From: ljc Date: Fri, 22 May 2020 15:48:43 +0800 Subject: [PATCH 028/211] =?UTF-8?q?=E9=85=8D=E7=BD=AEbutton?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application.properties | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 7f2465a..f6a6dfe 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,9 +1,10 @@ server.port=9100 server.servlet.context-path=/softline -spring.datasource.url= jdbc:mysql://localhost:3306/rz_archives?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai +spring.datasource.url= jdbc:mysql://localhost:3306/rz_archives spring.datasource.username=root spring.datasource.password=root spring.datasource.driver-class-name=com.mysql.jdbc.Driver +#ݿӳ spring.datasource.type=com.alibaba.druid.pool.DruidDataSource spring.datasource.druid.initialSize=5 spring.datasource.druid.minIdle=5 @@ -21,10 +22,21 @@ spring.datasource.druid.maxPoolPreparedStatementPerConnectionSize=20 spring.datasource.druid.useGlobalDataSourceStat=true spring.datasource.druid.connectionProperties=druid.stat.mergeSql=true;druid.stat.slowSqlMillis=500 +#redisӵַ +spring.jedis.host = 127.0.0.1 +spring.jedis.port = 6379 +spring.jedis.uri=redis://127.0.0.1:6379/11 +spring.jedis.maxTotal=100 +spring.jedis.maxIdle= 10 +spring.jedis.maxWaitMillis =100000 +#mybatis log +logging.level.com.soft.line.mapper = debug +pagehelper.helper-dialect=mysql +pagehelper.params=count=countSql +pagehelper.reasonable=true +pagehelper.support-methods-arguments=true #mybatisӳļ· #mybatis.mapper-locations=com.soft.line.mapper/*.xml #ʵ· -mybatis.type-aliases-package=com.soft.line.entity - -swagger.enabled=true \ No newline at end of file +mybatis.type-aliases-package=com.soft.line.entity \ No newline at end of file -- Gitee From 58a139a556f31b3558f726834eaf0779b09b3c65 Mon Sep 17 00:00:00 2001 From: ljc Date: Fri, 22 May 2020 15:57:08 +0800 Subject: [PATCH 029/211] =?UTF-8?q?=E9=85=8D=E7=BD=AEbutton?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/soft/line/aop/Permission.java | 2 + .../com/soft/line/aop/PermissionAspect.java | 4 +- .../controller/CertificateInfoController.java | 29 ++- .../soft/line/controller/LoginController.java | 22 +- .../com/soft/line/entity/CertificateInfo.java | 88 ++++---- .../java/com/soft/line/entity/UserInfo.java | 194 +++--------------- .../com/soft/line/entity/UserInfoToken.java | 21 ++ src/main/java/com/soft/line/filter/Token.java | 1 - .../com/soft/line/filter/UserTokenDto.java | 2 + .../line/mapper/CertificateInfoMapper.java | 11 +- .../line/mapper/CertificateInfoMapper.xml | 77 ++++--- .../com/soft/line/mapper/UserInfoMapper.java | 6 + .../com/soft/line/mapper/UserInfoMapper.xml | 33 +-- .../line/service/CertificateInfoService.java | 7 +- .../com/soft/line/service/LoginService.java | 16 ++ .../soft/line/service/UserInfoService.java | 12 ++ .../impl/CertificateInfoServiceImpl.java | 17 +- .../line/service/impl/LoginServiceImpl.java | 72 +++++++ .../service/impl/UserInfoServiceImpl.java | 22 ++ .../com/soft/line/util/redis/RedisClient.java | 1 + .../com/soft/line/util/redis/RedisConfig.java | 1 + 21 files changed, 347 insertions(+), 291 deletions(-) create mode 100644 src/main/java/com/soft/line/entity/UserInfoToken.java create mode 100644 src/main/java/com/soft/line/service/LoginService.java create mode 100644 src/main/java/com/soft/line/service/UserInfoService.java create mode 100644 src/main/java/com/soft/line/service/impl/LoginServiceImpl.java create mode 100644 src/main/java/com/soft/line/service/impl/UserInfoServiceImpl.java diff --git a/src/main/java/com/soft/line/aop/Permission.java b/src/main/java/com/soft/line/aop/Permission.java index f45eaa7..10aae27 100644 --- a/src/main/java/com/soft/line/aop/Permission.java +++ b/src/main/java/com/soft/line/aop/Permission.java @@ -1,5 +1,7 @@ package com.soft.line.aop; +import lombok.extern.slf4j.Slf4j; + import java.lang.annotation.*; /** diff --git a/src/main/java/com/soft/line/aop/PermissionAspect.java b/src/main/java/com/soft/line/aop/PermissionAspect.java index 56ee45e..ed484ed 100644 --- a/src/main/java/com/soft/line/aop/PermissionAspect.java +++ b/src/main/java/com/soft/line/aop/PermissionAspect.java @@ -1,8 +1,10 @@ package com.soft.line.aop; +import com.soft.line.entity.UserInfoToken; import com.soft.line.filter.HttpRequestUtil; import com.soft.line.filter.UserTokenDto; import lombok.extern.slf4j.Slf4j; +import org.apache.coyote.Response; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Aspect; @@ -31,7 +33,7 @@ public class PermissionAspect { Object[] objects= joinPoint.getArgs(); log.info("---"+objects[0]+"----"); //获取请求客户端的个人信息 - UserTokenDto userToken= HttpRequestUtil.getUserToken(); + UserTokenDto userToken=HttpRequestUtil.getUserToken(); //根据角色,编辑业务逻辑。。。。。 if(objects[0].equals("www")){ diff --git a/src/main/java/com/soft/line/controller/CertificateInfoController.java b/src/main/java/com/soft/line/controller/CertificateInfoController.java index 17bc3ec..40a8cc2 100644 --- a/src/main/java/com/soft/line/controller/CertificateInfoController.java +++ b/src/main/java/com/soft/line/controller/CertificateInfoController.java @@ -1,10 +1,10 @@ package com.soft.line.controller; +import com.soft.line.aop.Permission; import com.soft.line.entity.CertificateInfo; -import com.soft.line.entity.CodeDetail; import com.soft.line.service.CertificateInfoService; -import com.soft.line.service.CodeDetailService; import com.soft.line.util.exception.CommonResult; +import com.soft.line.util.pagehelper.PageBeans; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -14,7 +14,6 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpSession; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -24,7 +23,7 @@ import java.util.Map; * @version 0.1 */ -@Api(value = "证书接口",description = "证书接口") +@Api(description = "证书接口") @Slf4j @RestController @RequestMapping("/certificateInfo") @@ -32,22 +31,30 @@ public class CertificateInfoController { @Autowired private CertificateInfoService certificateInfoService; - @Autowired - private CodeDetailService codeDetailService; + //设置访问权限 + @Permission @ApiOperation(value = "个人证书列表", notes = "证书列表") //设置请求参数 @ApiImplicitParams({ - @ApiImplicitParam(name = "id", value = "用户ID", required = true, dataType = "Integer", paramType = "path") + // @ApiImplicitParam(paramType = "query", name = "userName", value = "名称", required = false, dataType = "String"), + // @ApiImplicitParam(paramType = "query", name = "dicCode", value = "编码", required = false, dataType = "String") + // ..... }) - @GetMapping("getCertificate/{id}") - public CommonResult getCertificateInfoByID(@PathVariable("id") Integer id) { - CertificateInfo ci = certificateInfoService.selectByPrimaryKey(id); - return CommonResult.success(ci); + @GetMapping("/getPersonalAll/{userName}") + public CommonResult> getPersonalAll(@PathVariable("userName") String userName) { + return CommonResult.success(certificateInfoService.getPersonalAll(userName)); + } + //map 封装请求分页参数 + @PostMapping("/getCompanyAllCertificates") + public PageBeans getCompanyAllCertificates(@RequestBody Map map){ + return certificateInfoService.getAllCompanyCertificates(map); + } + } diff --git a/src/main/java/com/soft/line/controller/LoginController.java b/src/main/java/com/soft/line/controller/LoginController.java index 05dc4d7..f01b70b 100644 --- a/src/main/java/com/soft/line/controller/LoginController.java +++ b/src/main/java/com/soft/line/controller/LoginController.java @@ -1,25 +1,31 @@ package com.soft.line.controller; +import com.soft.line.entity.UserInfo; +import com.soft.line.service.LoginService; +import com.soft.line.service.UserInfoService; import com.soft.line.util.exception.ResultData; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletRequest; +import java.util.Map; + /** * @author wu.xueqiao on 2020/5/8. * @version 0.1 */ +@Slf4j @RestController @RequestMapping("/user") public class LoginController { + @Autowired + private LoginService loginService; - @PostMapping("/register") - public ResultData registerUserInfo(@RequestParam String username,@RequestParam String password){ - - ResultData resultData=new ResultData(); - - //返回 - return resultData; - + @PostMapping("/login") + public ResultData registerUserInfo(@RequestBody Map map){ + return loginService.userLogin(map); } } diff --git a/src/main/java/com/soft/line/entity/CertificateInfo.java b/src/main/java/com/soft/line/entity/CertificateInfo.java index 5753a72..24ecf5e 100644 --- a/src/main/java/com/soft/line/entity/CertificateInfo.java +++ b/src/main/java/com/soft/line/entity/CertificateInfo.java @@ -1,17 +1,18 @@ package com.soft.line.entity; -import com.fasterxml.jackson.annotation.JsonFormat; - +import java.io.Serializable; import java.util.Date; -public class CertificateInfo { + +public class CertificateInfo implements Serializable{ + private static final long serialVersionUID = 688776107177440102L; /** * This field was generated by MyBatis Generator. * This field corresponds to the database column certificate_info.id * * @mbggenerated */ - private Integer id; + private Long id; /** * This field was generated by MyBatis Generator. @@ -19,7 +20,7 @@ public class CertificateInfo { * * @mbggenerated */ - private String certId; + private Long certId; /** * This field was generated by MyBatis Generator. @@ -51,7 +52,6 @@ public class CertificateInfo { * * @mbggenerated */ - @JsonFormat(pattern = "yyyy-MM-dd",timezone = "Asia/Shanghai") private Date beginDate; /** @@ -60,41 +60,39 @@ public class CertificateInfo { * * @mbggenerated */ - @JsonFormat(pattern = "yyyy-MM-dd",timezone = "Asia/Shanghai") private Date endDate; /** * This field was generated by MyBatis Generator. - * This field corresponds to the database column certificate_info.note + * This field corresponds to the database column certificate_info.cert_attachment * * @mbggenerated */ - private String note; + private String certAttachment; /** * This field was generated by MyBatis Generator. - * This field corresponds to the database column certificate_info.modify_person + * This field corresponds to the database column certificate_info.note * * @mbggenerated */ - private String modifyPerson; + private String note; /** * This field was generated by MyBatis Generator. - * This field corresponds to the database column certificate_info.modify_time + * This field corresponds to the database column certificate_info.modify_person * * @mbggenerated */ - @JsonFormat(pattern = "yyyy-MM-dd",timezone = "Asia/Shanghai") - private Date modifyTime; + private String modifyPerson; /** * This field was generated by MyBatis Generator. - * This field corresponds to the database column certificate_info.del_flg + * This field corresponds to the database column certificate_info.modify_time * * @mbggenerated */ - private Integer delFlg; + private Date modifyTime; /** * This method was generated by MyBatis Generator. @@ -104,7 +102,7 @@ public class CertificateInfo { * * @mbggenerated */ - public Integer getId() { + public Long getId() { return id; } @@ -116,7 +114,7 @@ public class CertificateInfo { * * @mbggenerated */ - public void setId(Integer id) { + public void setId(Long id) { this.id = id; } @@ -128,7 +126,7 @@ public class CertificateInfo { * * @mbggenerated */ - public String getCertId() { + public Long getCertId() { return certId; } @@ -140,8 +138,8 @@ public class CertificateInfo { * * @mbggenerated */ - public void setCertId(String certId) { - this.certId = certId == null ? null : certId.trim(); + public void setCertId(Long certId) { + this.certId = certId; } /** @@ -264,6 +262,30 @@ public class CertificateInfo { this.endDate = endDate; } + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column certificate_info.cert_attachment + * + * @return the value of certificate_info.cert_attachment + * + * @mbggenerated + */ + public String getCertAttachment() { + return certAttachment; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column certificate_info.cert_attachment + * + * @param certAttachment the value for certificate_info.cert_attachment + * + * @mbggenerated + */ + public void setCertAttachment(String certAttachment) { + this.certAttachment = certAttachment == null ? null : certAttachment.trim(); + } + /** * This method was generated by MyBatis Generator. * This method returns the value of the database column certificate_info.note @@ -335,28 +357,4 @@ public class CertificateInfo { public void setModifyTime(Date modifyTime) { this.modifyTime = modifyTime; } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column certificate_info.del_flg - * - * @return the value of certificate_info.del_flg - * - * @mbggenerated - */ - public Integer getDelFlg() { - return delFlg; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column certificate_info.del_flg - * - * @param delFlg the value for certificate_info.del_flg - * - * @mbggenerated - */ - public void setDelFlg(Integer delFlg) { - this.delFlg = delFlg; - } } \ No newline at end of file diff --git a/src/main/java/com/soft/line/entity/UserInfo.java b/src/main/java/com/soft/line/entity/UserInfo.java index 378e60d..6267a2e 100644 --- a/src/main/java/com/soft/line/entity/UserInfo.java +++ b/src/main/java/com/soft/line/entity/UserInfo.java @@ -9,7 +9,7 @@ public class UserInfo { * * @mbggenerated */ - private Integer id; + private Long id; /** * This field was generated by MyBatis Generator. @@ -37,59 +37,27 @@ public class UserInfo { /** * This field was generated by MyBatis Generator. - * This field corresponds to the database column user_info.modify_person - * - * @mbggenerated - */ - private String modifyPerson; - - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column user_info.modify_time - * - * @mbggenerated - */ - private Date modifyTime; - - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column user_info.head_img_url + * This field corresponds to the database column user_info.privilege * * @mbggenerated */ - private String headImgUrl; + private Integer privilege; /** * This field was generated by MyBatis Generator. - * This field corresponds to the database column user_info.user_status - * - * @mbggenerated - */ - private String userStatus; - - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column user_info.role_id - * - * @mbggenerated - */ - private Integer roleId; - - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column user_info.salt + * This field corresponds to the database column user_info.modify_person * * @mbggenerated */ - private String salt; + private String modifyPerson; /** * This field was generated by MyBatis Generator. - * This field corresponds to the database column user_info.open_id + * This field corresponds to the database column user_info.modify_time * * @mbggenerated */ - private String openId; + private Date modifyTime; /** * This method was generated by MyBatis Generator. @@ -99,7 +67,7 @@ public class UserInfo { * * @mbggenerated */ - public Integer getId() { + public Long getId() { return id; } @@ -111,7 +79,7 @@ public class UserInfo { * * @mbggenerated */ - public void setId(Integer id) { + public void setId(Long id) { this.id = id; } @@ -189,169 +157,73 @@ public class UserInfo { /** * This method was generated by MyBatis Generator. - * This method returns the value of the database column user_info.modify_person - * - * @return the value of user_info.modify_person - * - * @mbggenerated - */ - public String getModifyPerson() { - return modifyPerson; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column user_info.modify_person - * - * @param modifyPerson the value for user_info.modify_person - * - * @mbggenerated - */ - public void setModifyPerson(String modifyPerson) { - this.modifyPerson = modifyPerson == null ? null : modifyPerson.trim(); - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column user_info.modify_time - * - * @return the value of user_info.modify_time - * - * @mbggenerated - */ - public Date getModifyTime() { - return modifyTime; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column user_info.modify_time - * - * @param modifyTime the value for user_info.modify_time - * - * @mbggenerated - */ - public void setModifyTime(Date modifyTime) { - this.modifyTime = modifyTime; - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column user_info.head_img_url - * - * @return the value of user_info.head_img_url - * - * @mbggenerated - */ - public String getHeadImgUrl() { - return headImgUrl; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column user_info.head_img_url - * - * @param headImgUrl the value for user_info.head_img_url - * - * @mbggenerated - */ - public void setHeadImgUrl(String headImgUrl) { - this.headImgUrl = headImgUrl == null ? null : headImgUrl.trim(); - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column user_info.user_status + * This method returns the value of the database column user_info.privilege * - * @return the value of user_info.user_status + * @return the value of user_info.privilege * * @mbggenerated */ - public String getUserStatus() { - return userStatus; + public Integer getPrivilege() { + return privilege; } /** * This method was generated by MyBatis Generator. - * This method sets the value of the database column user_info.user_status + * This method sets the value of the database column user_info.privilege * - * @param userStatus the value for user_info.user_status + * @param privilege the value for user_info.privilege * * @mbggenerated */ - public void setUserStatus(String userStatus) { - this.userStatus = userStatus == null ? null : userStatus.trim(); + public void setPrivilege(Integer privilege) { + this.privilege = privilege; } /** * This method was generated by MyBatis Generator. - * This method returns the value of the database column user_info.role_id - * - * @return the value of user_info.role_id - * - * @mbggenerated - */ - public Integer getRoleId() { - return roleId; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column user_info.role_id - * - * @param roleId the value for user_info.role_id - * - * @mbggenerated - */ - public void setRoleId(Integer roleId) { - this.roleId = roleId; - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column user_info.salt + * This method returns the value of the database column user_info.modify_person * - * @return the value of user_info.salt + * @return the value of user_info.modify_person * * @mbggenerated */ - public String getSalt() { - return salt; + public String getModifyPerson() { + return modifyPerson; } /** * This method was generated by MyBatis Generator. - * This method sets the value of the database column user_info.salt + * This method sets the value of the database column user_info.modify_person * - * @param salt the value for user_info.salt + * @param modifyPerson the value for user_info.modify_person * * @mbggenerated */ - public void setSalt(String salt) { - this.salt = salt == null ? null : salt.trim(); + public void setModifyPerson(String modifyPerson) { + this.modifyPerson = modifyPerson == null ? null : modifyPerson.trim(); } /** * This method was generated by MyBatis Generator. - * This method returns the value of the database column user_info.open_id + * This method returns the value of the database column user_info.modify_time * - * @return the value of user_info.open_id + * @return the value of user_info.modify_time * * @mbggenerated */ - public String getOpenId() { - return openId; + public Date getModifyTime() { + return modifyTime; } /** * This method was generated by MyBatis Generator. - * This method sets the value of the database column user_info.open_id + * This method sets the value of the database column user_info.modify_time * - * @param openId the value for user_info.open_id + * @param modifyTime the value for user_info.modify_time * * @mbggenerated */ - public void setOpenId(String openId) { - this.openId = openId == null ? null : openId.trim(); + public void setModifyTime(Date modifyTime) { + this.modifyTime = modifyTime; } } \ No newline at end of file diff --git a/src/main/java/com/soft/line/entity/UserInfoToken.java b/src/main/java/com/soft/line/entity/UserInfoToken.java new file mode 100644 index 0000000..e74eec7 --- /dev/null +++ b/src/main/java/com/soft/line/entity/UserInfoToken.java @@ -0,0 +1,21 @@ +package com.soft.line.entity; + +import lombok.Data; + +/** + * @author wu.xueqiao on 2020/5/12. + * @version 0.1 + */ +@Data +public class UserInfoToken { + + private Integer userId; + private String userName; + private String account; + private String accountApp; + private String empCode; + private Integer orgId; + private String orgName; + private String token; + +} diff --git a/src/main/java/com/soft/line/filter/Token.java b/src/main/java/com/soft/line/filter/Token.java index 2a9b14b..90ba033 100644 --- a/src/main/java/com/soft/line/filter/Token.java +++ b/src/main/java/com/soft/line/filter/Token.java @@ -1,7 +1,6 @@ package com.soft.line.filter; import io.jsonwebtoken.*; - /** * @author wu.xueqiao on 2020/5/12. * @version 0.1 diff --git a/src/main/java/com/soft/line/filter/UserTokenDto.java b/src/main/java/com/soft/line/filter/UserTokenDto.java index 9e10a6e..4b26dd4 100644 --- a/src/main/java/com/soft/line/filter/UserTokenDto.java +++ b/src/main/java/com/soft/line/filter/UserTokenDto.java @@ -3,6 +3,8 @@ package com.soft.line.filter; import lombok.Data; import java.io.Serializable; +import java.util.List; +import java.util.Map; @Data public class UserTokenDto implements Serializable { diff --git a/src/main/java/com/soft/line/mapper/CertificateInfoMapper.java b/src/main/java/com/soft/line/mapper/CertificateInfoMapper.java index 02c47fe..ce1620e 100644 --- a/src/main/java/com/soft/line/mapper/CertificateInfoMapper.java +++ b/src/main/java/com/soft/line/mapper/CertificateInfoMapper.java @@ -1,8 +1,12 @@ package com.soft.line.mapper; import com.soft.line.entity.CertificateInfo; +import org.apache.ibatis.annotations.Mapper; + import java.util.List; +import java.util.Map; +@Mapper public interface CertificateInfoMapper { /** * This method was generated by MyBatis Generator. @@ -18,7 +22,7 @@ public interface CertificateInfoMapper { * * @mbggenerated */ - CertificateInfo selectByPrimaryKey(Integer id); + CertificateInfo selectByPrimaryKey(Long id); /** * This method was generated by MyBatis Generator. @@ -27,4 +31,9 @@ public interface CertificateInfoMapper { * @mbggenerated */ List selectAll(); + + + List getPersonalAll(String userName); + + List getAllCompanyCertificates(Map map); } \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/CertificateInfoMapper.xml b/src/main/java/com/soft/line/mapper/CertificateInfoMapper.xml index d071a42..a6ded55 100644 --- a/src/main/java/com/soft/line/mapper/CertificateInfoMapper.xml +++ b/src/main/java/com/soft/line/mapper/CertificateInfoMapper.xml @@ -1,67 +1,66 @@ - - - - + + + + - - - - - - - - - - - + + + + + + + + + + + - + insert into `certificate_info` (`cert_id`, `cert_type`, `cert_name`, `cert_unit`, `begin_date`, `end_date`, - `note`, `modify_person`, `modify_time`, - `del_flg`) - values (#{certId,jdbcType=VARCHAR}, #{certType,jdbcType=VARCHAR}, #{certName,jdbcType=VARCHAR}, + `cert_attachment`, `note`, `modify_person`, + `modify_time`) + values (#{certId,jdbcType=BIGINT}, #{certType,jdbcType=VARCHAR}, #{certName,jdbcType=VARCHAR}, #{certUnit,jdbcType=VARCHAR}, #{beginDate,jdbcType=TIMESTAMP}, #{endDate,jdbcType=TIMESTAMP}, - #{note,jdbcType=VARCHAR}, #{modifyPerson,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}, - #{delFlg,jdbcType=INTEGER}) + #{certAttachment,jdbcType=VARCHAR}, #{note,jdbcType=VARCHAR}, #{modifyPerson,jdbcType=VARCHAR}, + #{modifyTime,jdbcType=TIMESTAMP}) - - select `id`, - `cert_id`, - cd.code_content1 as cert_type, - `cert_name`, - `cert_unit`, - `begin_date`, - `end_date`, - t.`note`, - `modify_person`, - `modify_time`, - `del_flg` - from `certificate_info` t LEFT JOIN `code_detail` cd on cd.code_type='3' and cd.code_detail = t.cert_type + select `id`, `cert_id`, `cert_type`, `cert_name`, `cert_unit`, `begin_date`, `end_date`, + `cert_attachment`, `note`, `modify_person`, `modify_time` + from `certificate_info` where `id` = #{id,jdbcType=BIGINT} - - - select `id`, `cert_id`, `cert_type`, `cert_name`, `cert_unit`, `begin_date`, `end_date`, - `note`, `modify_person`, `modify_time`, `del_flg` + `cert_attachment`, `note`, `modify_person`, `modify_time` from `certificate_info` - + + \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/UserInfoMapper.java b/src/main/java/com/soft/line/mapper/UserInfoMapper.java index bc89a99..8fa879e 100644 --- a/src/main/java/com/soft/line/mapper/UserInfoMapper.java +++ b/src/main/java/com/soft/line/mapper/UserInfoMapper.java @@ -1,8 +1,12 @@ package com.soft.line.mapper; import com.soft.line.entity.UserInfo; +import org.apache.ibatis.annotations.Mapper; + import java.util.List; +import java.util.Map; +@Mapper public interface UserInfoMapper { /** * This method was generated by MyBatis Generator. @@ -27,4 +31,6 @@ public interface UserInfoMapper { * @mbggenerated */ List selectAll(); + + UserInfo userLogin(Map map); } \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/UserInfoMapper.xml b/src/main/java/com/soft/line/mapper/UserInfoMapper.xml index 0eda6fa..e17e725 100644 --- a/src/main/java/com/soft/line/mapper/UserInfoMapper.xml +++ b/src/main/java/com/soft/line/mapper/UserInfoMapper.xml @@ -10,13 +10,9 @@ + - - - - - insert into `user_info` (`user_name`, `password`, `phone`, - `modify_person`, `modify_time`, `head_img_url`, - `user_status`, `role_id`, `salt`, - `open_id`) + `privilege`, `modify_person`, `modify_time` + ) values (#{userName,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR}, #{phone,jdbcType=VARCHAR}, - #{modifyPerson,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}, #{headImgUrl,jdbcType=VARCHAR}, - #{userStatus,jdbcType=VARCHAR}, #{roleId,jdbcType=INTEGER}, #{salt,jdbcType=VARCHAR}, - #{openId,jdbcType=VARCHAR}) + #{privilege,jdbcType=INTEGER}, #{modifyPerson,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP} + ) - - select `id`, `user_name`, `password`, `phone`, `modify_person`, `modify_time`, `head_img_url`, - `user_status`, `role_id`, `salt`, `open_id` + select `id`, `user_name`, `password`, `phone`, `privilege`, `modify_person`, `modify_time` from `user_info` where `id` = #{id,jdbcType=INTEGER} @@ -47,8 +40,16 @@ WARNING - @mbggenerated This element is automatically generated by MyBatis Generator, do not modify. --> - select `id`, `user_name`, `password`, `phone`, `modify_person`, `modify_time`, `head_img_url`, - `user_status`, `role_id`, `salt`, `open_id` + select `id`, `user_name`, `password`, `phone`, `privilege`, `modify_person`, `modify_time` from `user_info` + + \ No newline at end of file diff --git a/src/main/java/com/soft/line/service/CertificateInfoService.java b/src/main/java/com/soft/line/service/CertificateInfoService.java index 2557052..673ea55 100644 --- a/src/main/java/com/soft/line/service/CertificateInfoService.java +++ b/src/main/java/com/soft/line/service/CertificateInfoService.java @@ -2,10 +2,12 @@ package com.soft.line.service; import com.soft.line.entity.CertificateInfo; import com.soft.line.mapper.CertificateInfoMapper; +import com.soft.line.util.pagehelper.PageBeans; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; +import java.util.Map; /** * @author wu.xueqiao on 2020/5/8. @@ -14,8 +16,7 @@ import java.util.List; public interface CertificateInfoService { - public List selectCertificateAll(); - - public CertificateInfo selectByPrimaryKey(Integer id); + public List getPersonalAll(String userName); + public PageBeans getAllCompanyCertificates(Map map); } diff --git a/src/main/java/com/soft/line/service/LoginService.java b/src/main/java/com/soft/line/service/LoginService.java new file mode 100644 index 0000000..36b7cf4 --- /dev/null +++ b/src/main/java/com/soft/line/service/LoginService.java @@ -0,0 +1,16 @@ +package com.soft.line.service; + +import com.soft.line.entity.UserInfo; +import com.soft.line.util.exception.ResultData; + +import java.util.Map; + +/** + * @author wu.xueqiao on 2020/5/12. + * @version 0.1 + */ +public interface LoginService { + + public ResultData userLogin(Map map); + +} diff --git a/src/main/java/com/soft/line/service/UserInfoService.java b/src/main/java/com/soft/line/service/UserInfoService.java new file mode 100644 index 0000000..4eb44a8 --- /dev/null +++ b/src/main/java/com/soft/line/service/UserInfoService.java @@ -0,0 +1,12 @@ +package com.soft.line.service; + +import com.soft.line.entity.UserInfo; + +/** + * @author wu.xueqiao on 2020/5/12. + * @version 0.1 + */ +public interface UserInfoService { + + public UserInfo getUserInfo(int userId); +} diff --git a/src/main/java/com/soft/line/service/impl/CertificateInfoServiceImpl.java b/src/main/java/com/soft/line/service/impl/CertificateInfoServiceImpl.java index 83375e5..acadc20 100644 --- a/src/main/java/com/soft/line/service/impl/CertificateInfoServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/CertificateInfoServiceImpl.java @@ -1,13 +1,17 @@ package com.soft.line.service.impl; +import com.github.pagehelper.Page; import com.soft.line.entity.CertificateInfo; import com.soft.line.mapper.CertificateInfoMapper; import com.soft.line.service.CertificateInfoService; +import com.soft.line.util.pagehelper.PageBeans; +import com.soft.line.util.pagehelper.PageUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; +import java.util.Map; /** * @author wu.xueqiao on 2020/5/8. @@ -19,14 +23,17 @@ public class CertificateInfoServiceImpl implements CertificateInfoService { @Autowired private CertificateInfoMapper certificateInfoMapper; - @Override - public List selectCertificateAll() { - return certificateInfoMapper.selectAll(); + public List getPersonalAll(String userName) { + return certificateInfoMapper.getPersonalAll(userName); } @Override - public CertificateInfo selectByPrimaryKey(Integer id) { - return certificateInfoMapper.selectByPrimaryKey(id); + public PageBeans getAllCompanyCertificates(Map map) { + final Page> page = PageUtil.setPageParam(map); + List certificateInfos=certificateInfoMapper.getAllCompanyCertificates(map); + PageBeans beans = new PageBeans(certificateInfos); + beans.setList(certificateInfos); + return beans; } } diff --git a/src/main/java/com/soft/line/service/impl/LoginServiceImpl.java b/src/main/java/com/soft/line/service/impl/LoginServiceImpl.java new file mode 100644 index 0000000..6b95897 --- /dev/null +++ b/src/main/java/com/soft/line/service/impl/LoginServiceImpl.java @@ -0,0 +1,72 @@ +package com.soft.line.service.impl; + +import com.soft.line.entity.UserInfo; +import com.soft.line.filter.GsonUtil; +import com.soft.line.filter.HttpRequestUtil; +import com.soft.line.filter.UserTokenDto; +import com.soft.line.mapper.UserInfoMapper; +import com.soft.line.service.LoginService; +import com.soft.line.util.exception.ResultData; +import com.soft.line.util.redis.RedisClient; +import io.jsonwebtoken.Jwts; +import io.jsonwebtoken.SignatureAlgorithm; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; + +/** + * @author wu.xueqiao on 2020/5/12. + * @version 0.1 + */ +@Slf4j +@Service +public class LoginServiceImpl implements LoginService { + + @Autowired + private UserInfoMapper userInfoMapper; + @Resource + private RedisClient redisClient; + @Override + public ResultData userLogin(Map map) { + + UserInfo userInfo= userInfoMapper.userLogin(map); + if(userInfo!=null){ + UserTokenDto user=new UserTokenDto(); + user.setUserName(userInfo.getUserName()); + user.setPassword(userInfo.getPassword()); + String token=returnToken(user); + user.setToken(token); + if (token == null || "".equals(token)) { + return new ResultData("0", "redis插入失败", null); + } + return new ResultData("1", "登录成功", user); + }else{ + return new ResultData("201","登录失败！",null); + } + } + + + public String returnToken(final UserTokenDto user) { + if (redisClient.getKeyValue(user.getUserName()) == null || "".equals(redisClient.getKeyValue(user.getUserName()))) { + final Map claims = new HashMap(); + claims.put("password", user.getPassword()); + claims.put("username", user.getUserName()); + claims.put("uuid", UUID.randomUUID().toString()); + final String token = Jwts.builder().setClaims(claims) + .signWith(SignatureAlgorithm.HS512, HttpRequestUtil.key).compact(); + user.setToken(token); + if (!redisClient.setKeyValue(user.getUserName(), GsonUtil.javabeanToJson(user),HttpRequestUtil.expire)) { + return null; + } + return token; + } else { + redisClient.setKeyTimeout(user.getUserName(), HttpRequestUtil.expire); + return GsonUtil.jsonToJavaBean(redisClient.getKeyValue(user.getUserName())).getToken(); + } + } +} diff --git a/src/main/java/com/soft/line/service/impl/UserInfoServiceImpl.java b/src/main/java/com/soft/line/service/impl/UserInfoServiceImpl.java new file mode 100644 index 0000000..69f303b --- /dev/null +++ b/src/main/java/com/soft/line/service/impl/UserInfoServiceImpl.java @@ -0,0 +1,22 @@ +package com.soft.line.service.impl; + +import com.soft.line.entity.UserInfo; +import com.soft.line.mapper.UserInfoMapper; +import com.soft.line.service.UserInfoService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +/** + * @author wu.xueqiao on 2020/5/12. + * @version 0.1 + */ +@Service +public class UserInfoServiceImpl implements UserInfoService { + + @Autowired + private UserInfoMapper userInfoMapper; + @Override + public UserInfo getUserInfo(int userId) { + return userInfoMapper.selectByPrimaryKey(userId); + } +} diff --git a/src/main/java/com/soft/line/util/redis/RedisClient.java b/src/main/java/com/soft/line/util/redis/RedisClient.java index 8d7d99e..6256b94 100644 --- a/src/main/java/com/soft/line/util/redis/RedisClient.java +++ b/src/main/java/com/soft/line/util/redis/RedisClient.java @@ -9,6 +9,7 @@ import java.util.List; import java.util.Set; + public class RedisClient { private ShardedJedisPool pool; diff --git a/src/main/java/com/soft/line/util/redis/RedisConfig.java b/src/main/java/com/soft/line/util/redis/RedisConfig.java index d24f3ce..9b62f82 100644 --- a/src/main/java/com/soft/line/util/redis/RedisConfig.java +++ b/src/main/java/com/soft/line/util/redis/RedisConfig.java @@ -1,6 +1,7 @@ package com.soft.line.util.redis; +import com.soft.line.util.redis.JedisProperties; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -- Gitee From 3335c21717f0bf814da85db1d61750ef6d52d287 Mon Sep 17 00:00:00 2001 From: matabiri <1119265069@qq.com> Date: Fri, 22 May 2020 15:57:32 +0800 Subject: [PATCH 030/211] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6=20?= =?UTF-8?q?.idea?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/.gitignore | 8 ----- .idea/compiler.xml | 22 -------------- .idea/encodings.xml | 6 ---- .idea/jarRepositories.xml | 30 ------------------- ...__ch_qos_logback_logback_classic_1_2_3.xml | 13 -------- ...ven__ch_qos_logback_logback_core_1_2_3.xml | 13 -------- .../Maven__com_alibaba_druid_1_1_10.xml | 13 -------- .../Maven__com_fasterxml_classmate_1_5_1.xml | 13 -------- ...ackson_core_jackson_annotations_2_10_4.xml | 13 -------- ...erxml_jackson_core_jackson_core_2_10_4.xml | 13 -------- ...l_jackson_core_jackson_databind_2_10_4.xml | 13 -------- ..._datatype_jackson_datatype_jdk8_2_10_4.xml | 13 -------- ...atatype_jackson_datatype_jsr310_2_10_4.xml | 13 -------- ..._jackson_module_parameter_names_2_10_4.xml | 13 -------- ...__com_github_jsqlparser_jsqlparser_1_2.xml | 13 -------- ...com_github_pagehelper_pagehelper_5_1_8.xml | 13 -------- ...elper_spring_boot_autoconfigure_1_2_10.xml | 13 -------- ..._pagehelper_spring_boot_starter_1_2_10.xml | 13 -------- .../Maven__com_google_guava_guava_18_0.xml | 13 -------- ...n__com_jayway_jsonpath_json_path_2_4_0.xml | 13 -------- ...ogle_android_json_0_0_20131108_vaadin1.xml | 13 -------- .../Maven__com_zaxxer_HikariCP_3_4_3.xml | 13 -------- ...mons_beanutils_commons_beanutils_1_9_4.xml | 13 -------- ..._collections_commons_collections_3_2_2.xml | 13 -------- ...mons_fileupload_commons_fileupload_1_4.xml | 13 -------- .../Maven__commons_io_commons_io_2_6.xml | 13 -------- ...n__commons_logging_commons_logging_1_2.xml | 13 -------- .../Maven__io_jsonwebtoken_jjwt_0_6_0.xml | 13 -------- ..._io_lettuce_lettuce_core_5_2_2_RELEASE.xml | 13 -------- ...en__io_netty_netty_buffer_4_1_49_Final.xml | 13 -------- ...ven__io_netty_netty_codec_4_1_49_Final.xml | 13 -------- ...en__io_netty_netty_common_4_1_49_Final.xml | 13 -------- ...n__io_netty_netty_handler_4_1_49_Final.xml | 13 -------- ...__io_netty_netty_resolver_4_1_49_Final.xml | 13 -------- ..._io_netty_netty_transport_4_1_49_Final.xml | 13 -------- ...jectreactor_reactor_core_3_3_5_RELEASE.xml | 13 -------- ...ven__io_springfox_springfox_core_2_5_0.xml | 13 -------- ...n__io_springfox_springfox_schema_2_5_0.xml | 13 -------- ...aven__io_springfox_springfox_spi_2_5_0.xml | 13 -------- ...o_springfox_springfox_spring_web_2_5_0.xml | 13 -------- ..._io_springfox_springfox_swagger2_2_5_0.xml | 13 -------- ...ringfox_springfox_swagger_common_2_5_0.xml | 13 -------- ...o_springfox_springfox_swagger_ui_2_5_0.xml | 13 -------- ...__io_swagger_swagger_annotations_1_5_9.xml | 13 -------- ...Maven__io_swagger_swagger_models_1_5_9.xml | 13 -------- ...ctivation_jakarta_activation_api_1_2_2.xml | 13 -------- ...nnotation_jakarta_annotation_api_1_3_5.xml | 13 -------- ...alidation_jakarta_validation_api_2_0_2.xml | 13 -------- ...ta_xml_bind_jakarta_xml_bind_api_2_3_3.xml | 13 -------- .idea/libraries/Maven__log4j_log4j_1_2_17.xml | 13 -------- ...ven__mysql_mysql_connector_java_5_1_40.xml | 13 -------- ...aven__net_bytebuddy_byte_buddy_1_10_10.xml | 13 -------- ...net_bytebuddy_byte_buddy_agent_1_10_10.xml | 13 -------- ...Maven__net_minidev_accessors_smart_1_2.xml | 13 -------- .../Maven__net_minidev_json_smart_2_3.xml | 13 -------- ...pache_commons_commons_collections4_4_4.xml | 13 -------- ...__org_apache_commons_commons_lang3_3_9.xml | 13 -------- ...org_apache_commons_commons_pool2_2_7_0.xml | 13 -------- ...n__org_apache_commons_commons_text_1_8.xml | 13 -------- ..._apache_logging_log4j_log4j_api_2_12_1.xml | 13 -------- ...he_logging_log4j_log4j_to_slf4j_2_12_1.xml | 13 -------- ..._tomcat_embed_tomcat_embed_core_9_0_34.xml | 13 -------- ...he_tomcat_embed_tomcat_embed_el_9_0_34.xml | 13 -------- ...at_embed_tomcat_embed_websocket_9_0_34.xml | 13 -------- ..._org_apiguardian_apiguardian_api_1_1_0.xml | 13 -------- ...Maven__org_aspectj_aspectjweaver_1_9_5.xml | 13 -------- ...Maven__org_assertj_assertj_core_3_13_2.xml | 13 -------- .../Maven__org_hamcrest_hamcrest_2_1.xml | 13 -------- ...dator_hibernate_validator_6_0_19_Final.xml | 13 -------- ...boss_logging_jboss_logging_3_4_1_Final.xml | 13 -------- ..._org_junit_jupiter_junit_jupiter_5_5_2.xml | 13 -------- ..._junit_jupiter_junit_jupiter_api_5_5_2.xml | 13 -------- ...nit_jupiter_junit_jupiter_engine_5_5_2.xml | 13 -------- ...nit_jupiter_junit_jupiter_params_5_5_2.xml | 13 -------- ..._platform_junit_platform_commons_1_5_2.xml | 13 -------- ...t_platform_junit_platform_engine_1_5_2.xml | 13 -------- ...n__org_mapstruct_mapstruct_1_0_0_Final.xml | 13 -------- .../Maven__org_mockito_mockito_core_3_1_0.xml | 13 -------- ...rg_mockito_mockito_junit_jupiter_3_1_0.xml | 13 -------- .../Maven__org_mybatis_mybatis_3_5_4.xml | 13 -------- ...aven__org_mybatis_mybatis_spring_2_0_4.xml | 13 -------- ...ybatis_spring_boot_autoconfigure_2_1_2.xml | 13 -------- ...boot_mybatis_spring_boot_starter_2_1_2.xml | 13 -------- .../Maven__org_objenesis_objenesis_2_6.xml | 13 -------- ...Maven__org_opentest4j_opentest4j_1_2_0.xml | 13 -------- .../Maven__org_ow2_asm_asm_5_0_4.xml | 13 -------- ...aven__org_projectlombok_lombok_1_18_12.xml | 13 -------- ...reactivestreams_reactive_streams_1_0_3.xml | 13 -------- ...aven__org_skyscreamer_jsonassert_1_5_0.xml | 13 -------- .../Maven__org_slf4j_jul_to_slf4j_1_7_30.xml | 13 -------- .../Maven__org_slf4j_slf4j_api_1_7_30.xml | 13 -------- ...amework_boot_spring_boot_2_2_7_RELEASE.xml | 13 -------- ...pring_boot_autoconfigure_2_2_7_RELEASE.xml | 13 -------- ...oot_spring_boot_devtools_2_2_7_RELEASE.xml | 13 -------- ...boot_spring_boot_starter_2_2_7_RELEASE.xml | 13 -------- ..._spring_boot_starter_aop_2_2_7_RELEASE.xml | 13 -------- ...pring_boot_starter_cache_2_2_7_RELEASE.xml | 13 -------- ..._boot_starter_data_redis_2_2_7_RELEASE.xml | 13 -------- ...spring_boot_starter_jdbc_2_2_7_RELEASE.xml | 13 -------- ...spring_boot_starter_json_2_2_7_RELEASE.xml | 13 -------- ...ing_boot_starter_logging_2_2_7_RELEASE.xml | 13 -------- ...spring_boot_starter_test_2_2_7_RELEASE.xml | 13 -------- ...ring_boot_starter_tomcat_2_2_7_RELEASE.xml | 13 -------- ..._boot_starter_validation_2_2_7_RELEASE.xml | 13 -------- ..._spring_boot_starter_web_2_2_7_RELEASE.xml | 13 -------- ...rk_boot_spring_boot_test_2_2_7_RELEASE.xml | 13 -------- ..._boot_test_autoconfigure_2_2_7_RELEASE.xml | 13 -------- ...data_spring_data_commons_2_2_7_RELEASE.xml | 13 -------- ...ata_spring_data_keyvalue_2_2_7_RELEASE.xml | 13 -------- ...k_data_spring_data_redis_2_2_7_RELEASE.xml | 13 -------- ...lugin_spring_plugin_core_1_2_0_RELEASE.xml | 13 -------- ...n_spring_plugin_metadata_1_2_0_RELEASE.xml | 13 -------- ...ringframework_spring_aop_5_2_6_RELEASE.xml | 13 -------- ...ngframework_spring_beans_5_2_6_RELEASE.xml | 13 -------- ...framework_spring_context_5_2_6_RELEASE.xml | 13 -------- ...k_spring_context_support_5_2_6_RELEASE.xml | 13 -------- ...ingframework_spring_core_5_2_6_RELEASE.xml | 13 -------- ...mework_spring_expression_5_2_6_RELEASE.xml | 13 -------- ...ringframework_spring_jcl_5_2_6_RELEASE.xml | 13 -------- ...ingframework_spring_jdbc_5_2_6_RELEASE.xml | 13 -------- ...ringframework_spring_oxm_5_2_6_RELEASE.xml | 13 -------- ...ingframework_spring_test_5_2_6_RELEASE.xml | 13 -------- ...pringframework_spring_tx_5_2_6_RELEASE.xml | 13 -------- ...ringframework_spring_web_5_2_6_RELEASE.xml | 13 -------- ...gframework_spring_webmvc_5_2_6_RELEASE.xml | 13 -------- .../Maven__org_xmlunit_xmlunit_core_2_6_4.xml | 13 -------- .../Maven__org_yaml_snakeyaml_1_25.xml | 13 -------- .idea/misc.xml | 11 ------- .idea/modules.xml | 8 ----- .idea/vcs.xml | 6 ---- 130 files changed, 1690 deletions(-) delete mode 100644 .idea/.gitignore delete mode 100644 .idea/compiler.xml delete mode 100644 .idea/encodings.xml delete mode 100644 .idea/jarRepositories.xml delete mode 100644 .idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_3.xml delete mode 100644 .idea/libraries/Maven__ch_qos_logback_logback_core_1_2_3.xml delete mode 100644 .idea/libraries/Maven__com_alibaba_druid_1_1_10.xml delete mode 100644 .idea/libraries/Maven__com_fasterxml_classmate_1_5_1.xml delete mode 100644 .idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_10_4.xml delete mode 100644 .idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_10_4.xml delete mode 100644 .idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_10_4.xml delete mode 100644 .idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_10_4.xml delete mode 100644 .idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_10_4.xml delete mode 100644 .idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_10_4.xml delete mode 100644 .idea/libraries/Maven__com_github_jsqlparser_jsqlparser_1_2.xml delete mode 100644 .idea/libraries/Maven__com_github_pagehelper_pagehelper_5_1_8.xml delete mode 100644 .idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_autoconfigure_1_2_10.xml delete mode 100644 .idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_starter_1_2_10.xml delete mode 100644 .idea/libraries/Maven__com_google_guava_guava_18_0.xml delete mode 100644 .idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml delete mode 100644 .idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml delete mode 100644 .idea/libraries/Maven__com_zaxxer_HikariCP_3_4_3.xml delete mode 100644 .idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_4.xml delete mode 100644 .idea/libraries/Maven__commons_collections_commons_collections_3_2_2.xml delete mode 100644 .idea/libraries/Maven__commons_fileupload_commons_fileupload_1_4.xml delete mode 100644 .idea/libraries/Maven__commons_io_commons_io_2_6.xml delete mode 100644 .idea/libraries/Maven__commons_logging_commons_logging_1_2.xml delete mode 100644 .idea/libraries/Maven__io_jsonwebtoken_jjwt_0_6_0.xml delete mode 100644 .idea/libraries/Maven__io_lettuce_lettuce_core_5_2_2_RELEASE.xml delete mode 100644 .idea/libraries/Maven__io_netty_netty_buffer_4_1_49_Final.xml delete mode 100644 .idea/libraries/Maven__io_netty_netty_codec_4_1_49_Final.xml delete mode 100644 .idea/libraries/Maven__io_netty_netty_common_4_1_49_Final.xml delete mode 100644 .idea/libraries/Maven__io_netty_netty_handler_4_1_49_Final.xml delete mode 100644 .idea/libraries/Maven__io_netty_netty_resolver_4_1_49_Final.xml delete mode 100644 .idea/libraries/Maven__io_netty_netty_transport_4_1_49_Final.xml delete mode 100644 .idea/libraries/Maven__io_projectreactor_reactor_core_3_3_5_RELEASE.xml delete mode 100644 .idea/libraries/Maven__io_springfox_springfox_core_2_5_0.xml delete mode 100644 .idea/libraries/Maven__io_springfox_springfox_schema_2_5_0.xml delete mode 100644 .idea/libraries/Maven__io_springfox_springfox_spi_2_5_0.xml delete mode 100644 .idea/libraries/Maven__io_springfox_springfox_spring_web_2_5_0.xml delete mode 100644 .idea/libraries/Maven__io_springfox_springfox_swagger2_2_5_0.xml delete mode 100644 .idea/libraries/Maven__io_springfox_springfox_swagger_common_2_5_0.xml delete mode 100644 .idea/libraries/Maven__io_springfox_springfox_swagger_ui_2_5_0.xml delete mode 100644 .idea/libraries/Maven__io_swagger_swagger_annotations_1_5_9.xml delete mode 100644 .idea/libraries/Maven__io_swagger_swagger_models_1_5_9.xml delete mode 100644 .idea/libraries/Maven__jakarta_activation_jakarta_activation_api_1_2_2.xml delete mode 100644 .idea/libraries/Maven__jakarta_annotation_jakarta_annotation_api_1_3_5.xml delete mode 100644 .idea/libraries/Maven__jakarta_validation_jakarta_validation_api_2_0_2.xml delete mode 100644 .idea/libraries/Maven__jakarta_xml_bind_jakarta_xml_bind_api_2_3_3.xml delete mode 100644 .idea/libraries/Maven__log4j_log4j_1_2_17.xml delete mode 100644 .idea/libraries/Maven__mysql_mysql_connector_java_5_1_40.xml delete mode 100644 .idea/libraries/Maven__net_bytebuddy_byte_buddy_1_10_10.xml delete mode 100644 .idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_10_10.xml delete mode 100644 .idea/libraries/Maven__net_minidev_accessors_smart_1_2.xml delete mode 100644 .idea/libraries/Maven__net_minidev_json_smart_2_3.xml delete mode 100644 .idea/libraries/Maven__org_apache_commons_commons_collections4_4_4.xml delete mode 100644 .idea/libraries/Maven__org_apache_commons_commons_lang3_3_9.xml delete mode 100644 .idea/libraries/Maven__org_apache_commons_commons_pool2_2_7_0.xml delete mode 100644 .idea/libraries/Maven__org_apache_commons_commons_text_1_8.xml delete mode 100644 .idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_12_1.xml delete mode 100644 .idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_12_1.xml delete mode 100644 .idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_34.xml delete mode 100644 .idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_9_0_34.xml delete mode 100644 .idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_34.xml delete mode 100644 .idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_0.xml delete mode 100644 .idea/libraries/Maven__org_aspectj_aspectjweaver_1_9_5.xml delete mode 100644 .idea/libraries/Maven__org_assertj_assertj_core_3_13_2.xml delete mode 100644 .idea/libraries/Maven__org_hamcrest_hamcrest_2_1.xml delete mode 100644 .idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_0_19_Final.xml delete mode 100644 .idea/libraries/Maven__org_jboss_logging_jboss_logging_3_4_1_Final.xml delete mode 100644 .idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_5_2.xml delete mode 100644 .idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_5_2.xml delete mode 100644 .idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_5_2.xml delete mode 100644 .idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_5_2.xml delete mode 100644 .idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_5_2.xml delete mode 100644 .idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_5_2.xml delete mode 100644 .idea/libraries/Maven__org_mapstruct_mapstruct_1_0_0_Final.xml delete mode 100644 .idea/libraries/Maven__org_mockito_mockito_core_3_1_0.xml delete mode 100644 .idea/libraries/Maven__org_mockito_mockito_junit_jupiter_3_1_0.xml delete mode 100644 .idea/libraries/Maven__org_mybatis_mybatis_3_5_4.xml delete mode 100644 .idea/libraries/Maven__org_mybatis_mybatis_spring_2_0_4.xml delete mode 100644 .idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_2_1_2.xml delete mode 100644 .idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_2_1_2.xml delete mode 100644 .idea/libraries/Maven__org_objenesis_objenesis_2_6.xml delete mode 100644 .idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml delete mode 100644 .idea/libraries/Maven__org_ow2_asm_asm_5_0_4.xml delete mode 100644 .idea/libraries/Maven__org_projectlombok_lombok_1_18_12.xml delete mode 100644 .idea/libraries/Maven__org_reactivestreams_reactive_streams_1_0_3.xml delete mode 100644 .idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml delete mode 100644 .idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_30.xml delete mode 100644 .idea/libraries/Maven__org_slf4j_slf4j_api_1_7_30.xml delete mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_2_2_7_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_2_7_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_devtools_2_2_7_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_2_7_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_2_7_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_cache_2_2_7_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_redis_2_2_7_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_2_7_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_2_7_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_2_7_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_2_7_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_2_7_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_validation_2_2_7_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_2_7_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_2_7_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_2_7_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_data_spring_data_commons_2_2_7_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_data_spring_data_keyvalue_2_2_7_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_data_spring_data_redis_2_2_7_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_1_2_0_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_plugin_spring_plugin_metadata_1_2_0_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_spring_aop_5_2_6_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_spring_beans_5_2_6_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_spring_context_5_2_6_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_spring_context_support_5_2_6_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_spring_core_5_2_6_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_spring_expression_5_2_6_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_spring_jcl_5_2_6_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_spring_jdbc_5_2_6_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_spring_oxm_5_2_6_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_spring_test_5_2_6_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_spring_tx_5_2_6_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_spring_web_5_2_6_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_spring_webmvc_5_2_6_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_xmlunit_xmlunit_core_2_6_4.xml delete mode 100644 .idea/libraries/Maven__org_yaml_snakeyaml_1_25.xml delete mode 100644 .idea/misc.xml delete mode 100644 .idea/modules.xml delete mode 100644 .idea/vcs.xml diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index 73f69e0..0000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml -# Datasource local storage ignored files -/dataSources/ -/dataSources.local.xml -# Editor-based HTTP Client requests -/httpRequests/ diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index f3de3d2..0000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml deleted file mode 100644 index 63e9001..0000000 --- a/.idea/encodings.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml deleted file mode 100644 index 15a50bb..0000000 --- a/.idea/jarRepositories.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_3.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_3.xml deleted file mode 100644 index 7493b57..0000000 --- a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_3.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_3.xml deleted file mode 100644 index a403ead..0000000 --- a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_alibaba_druid_1_1_10.xml b/.idea/libraries/Maven__com_alibaba_druid_1_1_10.xml deleted file mode 100644 index d3211e5..0000000 --- a/.idea/libraries/Maven__com_alibaba_druid_1_1_10.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_5_1.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_5_1.xml deleted file mode 100644 index 21396e2..0000000 --- a/.idea/libraries/Maven__com_fasterxml_classmate_1_5_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_10_4.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_10_4.xml deleted file mode 100644 index 15e0f3e..0000000 --- a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_10_4.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_10_4.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_10_4.xml deleted file mode 100644 index 440178e..0000000 --- a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_10_4.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_10_4.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_10_4.xml deleted file mode 100644 index 703b49c..0000000 --- a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_10_4.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_10_4.xml b/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_10_4.xml deleted file mode 100644 index 4a10908..0000000 --- a/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_10_4.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_10_4.xml b/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_10_4.xml deleted file mode 100644 index ccd1b43..0000000 --- a/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_10_4.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_10_4.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_10_4.xml deleted file mode 100644 index 0f0db27..0000000 --- a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_10_4.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_1_2.xml b/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_1_2.xml deleted file mode 100644 index e367d9d..0000000 --- a/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_1_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_pagehelper_pagehelper_5_1_8.xml b/.idea/libraries/Maven__com_github_pagehelper_pagehelper_5_1_8.xml deleted file mode 100644 index f57da67..0000000 --- a/.idea/libraries/Maven__com_github_pagehelper_pagehelper_5_1_8.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_autoconfigure_1_2_10.xml b/.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_autoconfigure_1_2_10.xml deleted file mode 100644 index a2ad2ef..0000000 --- a/.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_autoconfigure_1_2_10.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_starter_1_2_10.xml b/.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_starter_1_2_10.xml deleted file mode 100644 index 2737662..0000000 --- a/.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_starter_1_2_10.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_guava_guava_18_0.xml b/.idea/libraries/Maven__com_google_guava_guava_18_0.xml deleted file mode 100644 index 05310e2..0000000 --- a/.idea/libraries/Maven__com_google_guava_guava_18_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml b/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml deleted file mode 100644 index e1f705f..0000000 --- a/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml b/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml deleted file mode 100644 index f45360a..0000000 --- a/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_zaxxer_HikariCP_3_4_3.xml b/.idea/libraries/Maven__com_zaxxer_HikariCP_3_4_3.xml deleted file mode 100644 index eebd8bb..0000000 --- a/.idea/libraries/Maven__com_zaxxer_HikariCP_3_4_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_4.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_4.xml deleted file mode 100644 index 89f2484..0000000 --- a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_4.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_2.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_2.xml deleted file mode 100644 index 03a1d6d..0000000 --- a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_4.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_4.xml deleted file mode 100644 index e260d92..0000000 --- a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_4.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_6.xml b/.idea/libraries/Maven__commons_io_commons_io_2_6.xml deleted file mode 100644 index 4d81426..0000000 --- a/.idea/libraries/Maven__commons_io_commons_io_2_6.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml b/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml deleted file mode 100644 index 5d533a7..0000000 --- a/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_jsonwebtoken_jjwt_0_6_0.xml b/.idea/libraries/Maven__io_jsonwebtoken_jjwt_0_6_0.xml deleted file mode 100644 index 0d2cb5b..0000000 --- a/.idea/libraries/Maven__io_jsonwebtoken_jjwt_0_6_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_lettuce_lettuce_core_5_2_2_RELEASE.xml b/.idea/libraries/Maven__io_lettuce_lettuce_core_5_2_2_RELEASE.xml deleted file mode 100644 index 756fa16..0000000 --- a/.idea/libraries/Maven__io_lettuce_lettuce_core_5_2_2_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_buffer_4_1_49_Final.xml b/.idea/libraries/Maven__io_netty_netty_buffer_4_1_49_Final.xml deleted file mode 100644 index ec1ee45..0000000 --- a/.idea/libraries/Maven__io_netty_netty_buffer_4_1_49_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_codec_4_1_49_Final.xml b/.idea/libraries/Maven__io_netty_netty_codec_4_1_49_Final.xml deleted file mode 100644 index 8f7887f..0000000 --- a/.idea/libraries/Maven__io_netty_netty_codec_4_1_49_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_common_4_1_49_Final.xml b/.idea/libraries/Maven__io_netty_netty_common_4_1_49_Final.xml deleted file mode 100644 index fd10286..0000000 --- a/.idea/libraries/Maven__io_netty_netty_common_4_1_49_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_handler_4_1_49_Final.xml b/.idea/libraries/Maven__io_netty_netty_handler_4_1_49_Final.xml deleted file mode 100644 index 00a7d1a..0000000 --- a/.idea/libraries/Maven__io_netty_netty_handler_4_1_49_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_resolver_4_1_49_Final.xml b/.idea/libraries/Maven__io_netty_netty_resolver_4_1_49_Final.xml deleted file mode 100644 index dba9235..0000000 --- a/.idea/libraries/Maven__io_netty_netty_resolver_4_1_49_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_transport_4_1_49_Final.xml b/.idea/libraries/Maven__io_netty_netty_transport_4_1_49_Final.xml deleted file mode 100644 index b67c210..0000000 --- a/.idea/libraries/Maven__io_netty_netty_transport_4_1_49_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_projectreactor_reactor_core_3_3_5_RELEASE.xml b/.idea/libraries/Maven__io_projectreactor_reactor_core_3_3_5_RELEASE.xml deleted file mode 100644 index 183b184..0000000 --- a/.idea/libraries/Maven__io_projectreactor_reactor_core_3_3_5_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_springfox_springfox_core_2_5_0.xml b/.idea/libraries/Maven__io_springfox_springfox_core_2_5_0.xml deleted file mode 100644 index e5f84a6..0000000 --- a/.idea/libraries/Maven__io_springfox_springfox_core_2_5_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_springfox_springfox_schema_2_5_0.xml b/.idea/libraries/Maven__io_springfox_springfox_schema_2_5_0.xml deleted file mode 100644 index 6e400bc..0000000 --- a/.idea/libraries/Maven__io_springfox_springfox_schema_2_5_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_springfox_springfox_spi_2_5_0.xml b/.idea/libraries/Maven__io_springfox_springfox_spi_2_5_0.xml deleted file mode 100644 index d03f166..0000000 --- a/.idea/libraries/Maven__io_springfox_springfox_spi_2_5_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_springfox_springfox_spring_web_2_5_0.xml b/.idea/libraries/Maven__io_springfox_springfox_spring_web_2_5_0.xml deleted file mode 100644 index 676e480..0000000 --- a/.idea/libraries/Maven__io_springfox_springfox_spring_web_2_5_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_springfox_springfox_swagger2_2_5_0.xml b/.idea/libraries/Maven__io_springfox_springfox_swagger2_2_5_0.xml deleted file mode 100644 index 509eff4..0000000 --- a/.idea/libraries/Maven__io_springfox_springfox_swagger2_2_5_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_springfox_springfox_swagger_common_2_5_0.xml b/.idea/libraries/Maven__io_springfox_springfox_swagger_common_2_5_0.xml deleted file mode 100644 index c60ba87..0000000 --- a/.idea/libraries/Maven__io_springfox_springfox_swagger_common_2_5_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_springfox_springfox_swagger_ui_2_5_0.xml b/.idea/libraries/Maven__io_springfox_springfox_swagger_ui_2_5_0.xml deleted file mode 100644 index a0930b1..0000000 --- a/.idea/libraries/Maven__io_springfox_springfox_swagger_ui_2_5_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_swagger_swagger_annotations_1_5_9.xml b/.idea/libraries/Maven__io_swagger_swagger_annotations_1_5_9.xml deleted file mode 100644 index 0506740..0000000 --- a/.idea/libraries/Maven__io_swagger_swagger_annotations_1_5_9.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_swagger_swagger_models_1_5_9.xml b/.idea/libraries/Maven__io_swagger_swagger_models_1_5_9.xml deleted file mode 100644 index 1140464..0000000 --- a/.idea/libraries/Maven__io_swagger_swagger_models_1_5_9.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__jakarta_activation_jakarta_activation_api_1_2_2.xml b/.idea/libraries/Maven__jakarta_activation_jakarta_activation_api_1_2_2.xml deleted file mode 100644 index fdbcdd0..0000000 --- a/.idea/libraries/Maven__jakarta_activation_jakarta_activation_api_1_2_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__jakarta_annotation_jakarta_annotation_api_1_3_5.xml b/.idea/libraries/Maven__jakarta_annotation_jakarta_annotation_api_1_3_5.xml deleted file mode 100644 index 986950b..0000000 --- a/.idea/libraries/Maven__jakarta_annotation_jakarta_annotation_api_1_3_5.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__jakarta_validation_jakarta_validation_api_2_0_2.xml b/.idea/libraries/Maven__jakarta_validation_jakarta_validation_api_2_0_2.xml deleted file mode 100644 index b479729..0000000 --- a/.idea/libraries/Maven__jakarta_validation_jakarta_validation_api_2_0_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__jakarta_xml_bind_jakarta_xml_bind_api_2_3_3.xml b/.idea/libraries/Maven__jakarta_xml_bind_jakarta_xml_bind_api_2_3_3.xml deleted file mode 100644 index 7fe9955..0000000 --- a/.idea/libraries/Maven__jakarta_xml_bind_jakarta_xml_bind_api_2_3_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__log4j_log4j_1_2_17.xml b/.idea/libraries/Maven__log4j_log4j_1_2_17.xml deleted file mode 100644 index 9ff36fe..0000000 --- a/.idea/libraries/Maven__log4j_log4j_1_2_17.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_40.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_40.xml deleted file mode 100644 index 338a2a6..0000000 --- a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_40.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_10_10.xml b/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_10_10.xml deleted file mode 100644 index d7c7161..0000000 --- a/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_10_10.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_10_10.xml b/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_10_10.xml deleted file mode 100644 index 025fe02..0000000 --- a/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_10_10.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__net_minidev_accessors_smart_1_2.xml b/.idea/libraries/Maven__net_minidev_accessors_smart_1_2.xml deleted file mode 100644 index e9bd55e..0000000 --- a/.idea/libraries/Maven__net_minidev_accessors_smart_1_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__net_minidev_json_smart_2_3.xml b/.idea/libraries/Maven__net_minidev_json_smart_2_3.xml deleted file mode 100644 index 7e3ce5c..0000000 --- a/.idea/libraries/Maven__net_minidev_json_smart_2_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_collections4_4_4.xml b/.idea/libraries/Maven__org_apache_commons_commons_collections4_4_4.xml deleted file mode 100644 index 894626e..0000000 --- a/.idea/libraries/Maven__org_apache_commons_commons_collections4_4_4.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_9.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_9.xml deleted file mode 100644 index 0cf74c1..0000000 --- a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_9.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_pool2_2_7_0.xml b/.idea/libraries/Maven__org_apache_commons_commons_pool2_2_7_0.xml deleted file mode 100644 index 8d52584..0000000 --- a/.idea/libraries/Maven__org_apache_commons_commons_pool2_2_7_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_text_1_8.xml b/.idea/libraries/Maven__org_apache_commons_commons_text_1_8.xml deleted file mode 100644 index d3898f3..0000000 --- a/.idea/libraries/Maven__org_apache_commons_commons_text_1_8.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_12_1.xml b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_12_1.xml deleted file mode 100644 index 52fb201..0000000 --- a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_12_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_12_1.xml b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_12_1.xml deleted file mode 100644 index f1a0aeb..0000000 --- a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_12_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_34.xml b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_34.xml deleted file mode 100644 index ea63753..0000000 --- a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_34.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_9_0_34.xml b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_9_0_34.xml deleted file mode 100644 index 19861d6..0000000 --- a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_9_0_34.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_34.xml b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_34.xml deleted file mode 100644 index d9ee910..0000000 --- a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_34.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_0.xml b/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_0.xml deleted file mode 100644 index 9a50009..0000000 --- a/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_9_5.xml b/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_9_5.xml deleted file mode 100644 index f24ea0e..0000000 --- a/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_9_5.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_assertj_assertj_core_3_13_2.xml b/.idea/libraries/Maven__org_assertj_assertj_core_3_13_2.xml deleted file mode 100644 index 6682843..0000000 --- a/.idea/libraries/Maven__org_assertj_assertj_core_3_13_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_2_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_2_1.xml deleted file mode 100644 index e2c94de..0000000 --- a/.idea/libraries/Maven__org_hamcrest_hamcrest_2_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_0_19_Final.xml b/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_0_19_Final.xml deleted file mode 100644 index be86c32..0000000 --- a/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_0_19_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_4_1_Final.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_4_1_Final.xml deleted file mode 100644 index 58d3ffb..0000000 --- a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_4_1_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_5_2.xml b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_5_2.xml deleted file mode 100644 index edbb0d2..0000000 --- a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_5_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_5_2.xml b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_5_2.xml deleted file mode 100644 index 3c53e35..0000000 --- a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_5_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_5_2.xml b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_5_2.xml deleted file mode 100644 index bfb6ca5..0000000 --- a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_5_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_5_2.xml b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_5_2.xml deleted file mode 100644 index 1a36de1..0000000 --- a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_5_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_5_2.xml b/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_5_2.xml deleted file mode 100644 index b4df79e..0000000 --- a/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_5_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_5_2.xml b/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_5_2.xml deleted file mode 100644 index bfce41e..0000000 --- a/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_5_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mapstruct_mapstruct_1_0_0_Final.xml b/.idea/libraries/Maven__org_mapstruct_mapstruct_1_0_0_Final.xml deleted file mode 100644 index c5fe363..0000000 --- a/.idea/libraries/Maven__org_mapstruct_mapstruct_1_0_0_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_3_1_0.xml b/.idea/libraries/Maven__org_mockito_mockito_core_3_1_0.xml deleted file mode 100644 index 8c76780..0000000 --- a/.idea/libraries/Maven__org_mockito_mockito_core_3_1_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_junit_jupiter_3_1_0.xml b/.idea/libraries/Maven__org_mockito_mockito_junit_jupiter_3_1_0.xml deleted file mode 100644 index 1991a90..0000000 --- a/.idea/libraries/Maven__org_mockito_mockito_junit_jupiter_3_1_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mybatis_mybatis_3_5_4.xml b/.idea/libraries/Maven__org_mybatis_mybatis_3_5_4.xml deleted file mode 100644 index c58796d..0000000 --- a/.idea/libraries/Maven__org_mybatis_mybatis_3_5_4.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mybatis_mybatis_spring_2_0_4.xml b/.idea/libraries/Maven__org_mybatis_mybatis_spring_2_0_4.xml deleted file mode 100644 index 66f5630..0000000 --- a/.idea/libraries/Maven__org_mybatis_mybatis_spring_2_0_4.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_2_1_2.xml b/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_2_1_2.xml deleted file mode 100644 index 9316310..0000000 --- a/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_2_1_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_2_1_2.xml b/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_2_1_2.xml deleted file mode 100644 index f6ddd21..0000000 --- a/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_2_1_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_2_6.xml b/.idea/libraries/Maven__org_objenesis_objenesis_2_6.xml deleted file mode 100644 index 9ca25ef..0000000 --- a/.idea/libraries/Maven__org_objenesis_objenesis_2_6.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml b/.idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml deleted file mode 100644 index 9ec0242..0000000 --- a/.idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_ow2_asm_asm_5_0_4.xml b/.idea/libraries/Maven__org_ow2_asm_asm_5_0_4.xml deleted file mode 100644 index eb3638f..0000000 --- a/.idea/libraries/Maven__org_ow2_asm_asm_5_0_4.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_projectlombok_lombok_1_18_12.xml b/.idea/libraries/Maven__org_projectlombok_lombok_1_18_12.xml deleted file mode 100644 index 473e68f..0000000 --- a/.idea/libraries/Maven__org_projectlombok_lombok_1_18_12.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_reactivestreams_reactive_streams_1_0_3.xml b/.idea/libraries/Maven__org_reactivestreams_reactive_streams_1_0_3.xml deleted file mode 100644 index 1a02c00..0000000 --- a/.idea/libraries/Maven__org_reactivestreams_reactive_streams_1_0_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml b/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml deleted file mode 100644 index 7cb3a6e..0000000 --- a/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_30.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_30.xml deleted file mode 100644 index 2a8d7bf..0000000 --- a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_30.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_30.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_30.xml deleted file mode 100644 index 6977f51..0000000 --- a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_30.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_2_7_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_2_7_RELEASE.xml deleted file mode 100644 index afcb7fd..0000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_2_7_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_2_7_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_2_7_RELEASE.xml deleted file mode 100644 index 5a95ea0..0000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_2_7_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_devtools_2_2_7_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_devtools_2_2_7_RELEASE.xml deleted file mode 100644 index af97c66..0000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_devtools_2_2_7_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_2_7_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_2_7_RELEASE.xml deleted file mode 100644 index 0233b5e..0000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_2_7_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_2_7_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_2_7_RELEASE.xml deleted file mode 100644 index 4d3f83e..0000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_2_7_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_cache_2_2_7_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_cache_2_2_7_RELEASE.xml deleted file mode 100644 index 5525792..0000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_cache_2_2_7_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_redis_2_2_7_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_redis_2_2_7_RELEASE.xml deleted file mode 100644 index 44a48d4..0000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_redis_2_2_7_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_2_7_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_2_7_RELEASE.xml deleted file mode 100644 index 8d8a862..0000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_2_7_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_2_7_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_2_7_RELEASE.xml deleted file mode 100644 index e55a166..0000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_2_7_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_2_7_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_2_7_RELEASE.xml deleted file mode 100644 index d4677d8..0000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_2_7_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_2_7_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_2_7_RELEASE.xml deleted file mode 100644 index fef1921..0000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_2_7_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_2_7_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_2_7_RELEASE.xml deleted file mode 100644 index 2c1c30c..0000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_2_7_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_validation_2_2_7_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_validation_2_2_7_RELEASE.xml deleted file mode 100644 index 3e73a27..0000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_validation_2_2_7_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_2_7_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_2_7_RELEASE.xml deleted file mode 100644 index 9245344..0000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_2_7_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_2_7_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_2_7_RELEASE.xml deleted file mode 100644 index fe9b58e..0000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_2_7_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_2_7_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_2_7_RELEASE.xml deleted file mode 100644 index 71586ff..0000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_2_7_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_2_7_RELEASE.xml b/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_2_7_RELEASE.xml deleted file mode 100644 index ddea81d..0000000 --- a/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_2_7_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_data_spring_data_keyvalue_2_2_7_RELEASE.xml b/.idea/libraries/Maven__org_springframework_data_spring_data_keyvalue_2_2_7_RELEASE.xml deleted file mode 100644 index 7b4410a..0000000 --- a/.idea/libraries/Maven__org_springframework_data_spring_data_keyvalue_2_2_7_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_data_spring_data_redis_2_2_7_RELEASE.xml b/.idea/libraries/Maven__org_springframework_data_spring_data_redis_2_2_7_RELEASE.xml deleted file mode 100644 index c844756..0000000 --- a/.idea/libraries/Maven__org_springframework_data_spring_data_redis_2_2_7_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_1_2_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_1_2_0_RELEASE.xml deleted file mode 100644 index adec55c..0000000 --- a/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_1_2_0_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_metadata_1_2_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_metadata_1_2_0_RELEASE.xml deleted file mode 100644 index ba07f04..0000000 --- a/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_metadata_1_2_0_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_5_2_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_5_2_6_RELEASE.xml deleted file mode 100644 index 9b83e3b..0000000 --- a/.idea/libraries/Maven__org_springframework_spring_aop_5_2_6_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_5_2_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_5_2_6_RELEASE.xml deleted file mode 100644 index 266aae6..0000000 --- a/.idea/libraries/Maven__org_springframework_spring_beans_5_2_6_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_5_2_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_5_2_6_RELEASE.xml deleted file mode 100644 index 0a298bc..0000000 --- a/.idea/libraries/Maven__org_springframework_spring_context_5_2_6_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_support_5_2_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_support_5_2_6_RELEASE.xml deleted file mode 100644 index 48fea4a..0000000 --- a/.idea/libraries/Maven__org_springframework_spring_context_support_5_2_6_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_core_5_2_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_core_5_2_6_RELEASE.xml deleted file mode 100644 index 26cd03a..0000000 --- a/.idea/libraries/Maven__org_springframework_spring_core_5_2_6_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_5_2_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_expression_5_2_6_RELEASE.xml deleted file mode 100644 index f93c5ed..0000000 --- a/.idea/libraries/Maven__org_springframework_spring_expression_5_2_6_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jcl_5_2_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jcl_5_2_6_RELEASE.xml deleted file mode 100644 index 273251f..0000000 --- a/.idea/libraries/Maven__org_springframework_spring_jcl_5_2_6_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_5_2_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_5_2_6_RELEASE.xml deleted file mode 100644 index a5f7127..0000000 --- a/.idea/libraries/Maven__org_springframework_spring_jdbc_5_2_6_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_oxm_5_2_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_oxm_5_2_6_RELEASE.xml deleted file mode 100644 index 129bb16..0000000 --- a/.idea/libraries/Maven__org_springframework_spring_oxm_5_2_6_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_test_5_2_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_test_5_2_6_RELEASE.xml deleted file mode 100644 index e419d05..0000000 --- a/.idea/libraries/Maven__org_springframework_spring_test_5_2_6_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_5_2_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_tx_5_2_6_RELEASE.xml deleted file mode 100644 index 14ea38a..0000000 --- a/.idea/libraries/Maven__org_springframework_spring_tx_5_2_6_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_web_5_2_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_web_5_2_6_RELEASE.xml deleted file mode 100644 index 294accf..0000000 --- a/.idea/libraries/Maven__org_springframework_spring_web_5_2_6_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_webmvc_5_2_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_webmvc_5_2_6_RELEASE.xml deleted file mode 100644 index 3e5388c..0000000 --- a/.idea/libraries/Maven__org_springframework_spring_webmvc_5_2_6_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_6_4.xml b/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_6_4.xml deleted file mode 100644 index 8011e75..0000000 --- a/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_6_4.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_yaml_snakeyaml_1_25.xml b/.idea/libraries/Maven__org_yaml_snakeyaml_1_25.xml deleted file mode 100644 index e75d127..0000000 --- a/.idea/libraries/Maven__org_yaml_snakeyaml_1_25.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 4361200..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index 42a633f..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 35eb1dd..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file -- Gitee From c2a2f1936c3c3e744b2e9fe2ba3461cc52f7e425 Mon Sep 17 00:00:00 2001 From: ljc <1119265069@qq.com> Date: Sat, 23 May 2020 01:17:36 +0800 Subject: [PATCH 031/211] menuinfo orderby --- softline-files-manage.iml | 4 ++++ src/main/java/com/soft/line/entity/MenuInfo.java | 14 +++++++------- .../com/soft/line/filter/ConfigurationFilter.java | 2 +- .../java/com/soft/line/mapper/MenuInfoMapper.xml | 10 +++++----- 4 files changed, 17 insertions(+), 13 deletions(-) diff --git a/softline-files-manage.iml b/softline-files-manage.iml index 2a0be0c..ff201ec 100644 --- a/softline-files-manage.iml +++ b/softline-files-manage.iml @@ -25,6 +25,10 @@ + + + + diff --git a/src/main/java/com/soft/line/entity/MenuInfo.java b/src/main/java/com/soft/line/entity/MenuInfo.java index 8f91835..bee74b5 100644 --- a/src/main/java/com/soft/line/entity/MenuInfo.java +++ b/src/main/java/com/soft/line/entity/MenuInfo.java @@ -50,7 +50,7 @@ public class MenuInfo { * * @mbggenerated */ - private String oredby; + private String orderby; /** * This field was generated by MyBatis Generator. @@ -206,20 +206,20 @@ public class MenuInfo { * * @mbggenerated */ - public String getOredby() { - return oredby; + public String getOrderby() { + return orderby; } /** * This method was generated by MyBatis Generator. - * This method sets the value of the database column menu_info.oredby + * This method sets the value of the database column menu_info.orderby * - * @param oredby the value for menu_info.oredby + * @param orderby the value for menu_info.orderby * * @mbggenerated */ - public void setOredby(String oredby) { - this.oredby = oredby == null ? null : oredby.trim(); + public void setOrderby(String orderby) { + this.orderby = orderby == null ? null : orderby.trim(); } /** diff --git a/src/main/java/com/soft/line/filter/ConfigurationFilter.java b/src/main/java/com/soft/line/filter/ConfigurationFilter.java index 5036bdc..775821a 100644 --- a/src/main/java/com/soft/line/filter/ConfigurationFilter.java +++ b/src/main/java/com/soft/line/filter/ConfigurationFilter.java @@ -66,7 +66,7 @@ public class ConfigurationFilter { final String uri = request.getRequestURI(); String auth = request.getHeader("Authorization"); Token token = null; - if (!uri.contains("/login")) { + if (!uri.contains("/")) { if (auth == null || "".equals(auth)) { if (uri.contains("/file/download/")) { auth = request.getParameter("token"); diff --git a/src/main/java/com/soft/line/mapper/MenuInfoMapper.xml b/src/main/java/com/soft/line/mapper/MenuInfoMapper.xml index 20dd73c..c16636e 100644 --- a/src/main/java/com/soft/line/mapper/MenuInfoMapper.xml +++ b/src/main/java/com/soft/line/mapper/MenuInfoMapper.xml @@ -11,29 +11,29 @@ - + insert into `menu_info` (`menu_icon`, `menu_name`, `state`, - `menu_url`, `oredby`, `p_id`, + `menu_url`, `orderby`, `p_id`, `modify_person`, `modify_time`) values (#{menuIcon,jdbcType=VARCHAR}, #{menuName,jdbcType=VARCHAR}, #{state,jdbcType=INTEGER}, - #{menuUrl,jdbcType=VARCHAR}, #{oredby,jdbcType=VARCHAR}, #{pId,jdbcType=INTEGER}, + #{menuUrl,jdbcType=VARCHAR}, #{orderby,jdbcType=VARCHAR}, #{pId,jdbcType=INTEGER}, #{modifyPerson,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}) -- Gitee From 5a4acd745bf36d5f04a44fc8fda873945c86005d Mon Sep 17 00:00:00 2001 From: ljc <1119265069@qq.com> Date: Sun, 24 May 2020 22:50:37 +0800 Subject: [PATCH 032/211] menuinfo orderby --- .../soft/line/controller/MenuController.java | 87 +++++++++++++++--- .../java/com/soft/line/entity/MenuInfo.java | 10 +-- .../soft/line/mapper/ButtonInfoMapper.java | 2 + .../com/soft/line/mapper/ButtonInfoMapper.xml | 6 ++ .../line/mapper/MenuButtonInfoMapper.java | 13 ++- .../soft/line/mapper/MenuButtonInfoMapper.xml | 64 ++++++++++--- .../com/soft/line/mapper/MenuInfoMapper.java | 23 +++++ .../com/soft/line/mapper/MenuInfoMapper.xml | 44 ++++++++- .../soft/line/service/MenuInfoService.java | 17 +++- .../service/impl/MenuInfoServiceImpl.java | 89 ++++++++++++++++++- .../line/util/generator/mybatis-generator.xml | 8 +- src/main/resources/application.properties | 2 +- 12 files changed, 320 insertions(+), 45 deletions(-) diff --git a/src/main/java/com/soft/line/controller/MenuController.java b/src/main/java/com/soft/line/controller/MenuController.java index 0521d17..0d4caf7 100644 --- a/src/main/java/com/soft/line/controller/MenuController.java +++ b/src/main/java/com/soft/line/controller/MenuController.java @@ -1,11 +1,13 @@ package com.soft.line.controller; import com.github.pagehelper.PageInfo; +import com.soft.line.entity.ButtonInfo; import com.soft.line.entity.MenuButtonInfo; import com.soft.line.entity.MenuInfo; import com.soft.line.service.CodeDetailService; import com.soft.line.service.MenuInfoService; import com.soft.line.util.exception.CommonResult; +import com.soft.line.util.exception.ResultData; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -14,8 +16,7 @@ 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; +import java.util.*; @Api(value = "菜单接口") @Slf4j @@ -33,21 +34,85 @@ public class MenuController { return CommonResult.success(menuInfoService.selectAll(map)); } - @ApiOperation(value = "菜单按钮列表") + @GetMapping("/systemAdmin/selectALlMenuName") + @ApiOperation(value = "查询所有菜单名称") + public CommonResult> getAllMenuNames() { + return CommonResult.success(menuInfoService.selectALlMenuName()); + } + + @ApiOperation(value = "获取菜单") @ApiImplicitParams({ @ApiImplicitParam(name = "menuId", value = "菜单ID", required = true, dataType = "Integer", paramType = "path") }) - @GetMapping("systemAdmin/menus/{menuId}") - public CommonResult> getCertificateInfoByID(@PathVariable("menuId") Integer menuId) { - return CommonResult.success(menuInfoService.selectAllByMenuId(menuId)); + @GetMapping("systemAdmin/getMenu") + public CommonResult getMenuInfoByID(@RequestBody Map map) { + Integer id = (Integer) map.get("id"); + return CommonResult.success(menuInfoService.selectByPrimaryKey(id)); + } + + @ApiOperation(value = "删除菜单") + @PostMapping("systemAdmin/deleteMenu") + public ResultData deleteMenu(@RequestBody Map map){ + Integer menuId = (Integer) map.get("id"); + return new ResultData("200","删除成功",null); } - /*@ApiOperation(value = "菜单按钮列表") - @GetMapping("systemAdmin/menus/addupdatemenu") - public CommonResult addMenu(@RequestBody Map map) { + @ApiOperation(value = "保存菜单") + @PostMapping("systemAdmin/menus/saveMenu") + public ResultData saveMenu(@RequestBody Map map) { + MenuInfo menuInfo = new MenuInfo(); + if (map.get("id")!=null&&!map.get("id").toString().equals("")){ + menuInfo.setId((Integer) map.get("id")); + } + if (map.get("menuName")==null){ + return new ResultData("500","菜单名称不能为空",null); + }else{ + menuInfo.setMenuName(map.get("menuName").toString()); + } + //新增时判断menuName是否重复 + if (menuInfo.getId()==null&&menuInfo.getMenuName()!=null){ + int i=menuInfoService.countMenuName(menuInfo.getMenuName()); + if (i>0){ + return new ResultData("500","菜单名称已存在",null); + } + } + + menuInfo.setMenuIcon(map.get("menuIcon")==null?"":map.get("menuIcon").toString()); + menuInfo.setMenuUrl(map.get("menuUrl")==null?"":map.get("menuUrl").toString()); + menuInfo.setOrderby(map.get("orderby")==null?"":map.get("orderby").toString()); + //判断父级菜单是否存在 + if (map.get("pName")==null||map.get("pName").toString().equals("")){ + menuInfo.setpId(-1); + menuInfo.setState(1); + }else { + MenuInfo pMenu = menuInfoService.selectAllByMenuName(map.get("pName").toString()); + if (pMenu==null){ + return new ResultData("500","父级菜单不存在",null); + } + menuInfo.setpId(pMenu.getpId()); + menuInfo.setState(pMenu.getState()+1); + } + + + menuInfo.setModifyTime(new Date()); + menuInfo.setModifyPerson("admin"); + List buttonInfos =new ArrayList(); + for (Map buttonMap : (List>)map.get("buttonInfoList")){ + ButtonInfo buttonInfo = new ButtonInfo(); + buttonInfo.setButtonId(buttonMap.get("buttonId").toString()); + buttonInfo.setButtonName(buttonMap.get("buttonName").toString()); + buttonInfo.setButtonType(buttonMap.get("buttonType").toString()); + buttonInfos.add(buttonInfo); + } + if (menuInfo.getId()!=null){ + menuInfoService.addMenuInfo(menuInfo); + return new ResultData("200","更新成功",null); + }else{ + menuInfoService.updateMenInfo(menuInfo); + return new ResultData("200","添加成功",null); + } + } - return CommonResult.success(menuInfoService.selectAll(map) ); - }*/ } diff --git a/src/main/java/com/soft/line/entity/MenuInfo.java b/src/main/java/com/soft/line/entity/MenuInfo.java index bee74b5..06a899e 100644 --- a/src/main/java/com/soft/line/entity/MenuInfo.java +++ b/src/main/java/com/soft/line/entity/MenuInfo.java @@ -76,7 +76,7 @@ public class MenuInfo { */ private Date modifyTime; - private List menuButtonInfoList; + private List buttonInfoList; /** * This method was generated by MyBatis Generator. @@ -294,11 +294,11 @@ public class MenuInfo { this.modifyTime = modifyTime; } - public List getMenuButtonInfoList() { - return menuButtonInfoList; + public List getButtonInfoList() { + return buttonInfoList; } - public void setMenuButtonInfoList(List menuButtonInfoList) { - this.menuButtonInfoList = menuButtonInfoList; + public void setButtonInfoList(List buttonInfoList) { + this.buttonInfoList = buttonInfoList; } } \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/ButtonInfoMapper.java b/src/main/java/com/soft/line/mapper/ButtonInfoMapper.java index 4008645..230461a 100644 --- a/src/main/java/com/soft/line/mapper/ButtonInfoMapper.java +++ b/src/main/java/com/soft/line/mapper/ButtonInfoMapper.java @@ -11,4 +11,6 @@ public interface ButtonInfoMapper { List selectAll(); + List selectButtonsByMenuId(Integer menuId); + } \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/ButtonInfoMapper.xml b/src/main/java/com/soft/line/mapper/ButtonInfoMapper.xml index 6283095..8375aa5 100644 --- a/src/main/java/com/soft/line/mapper/ButtonInfoMapper.xml +++ b/src/main/java/com/soft/line/mapper/ButtonInfoMapper.xml @@ -12,4 +12,10 @@ from `code_detail` where `code_type` = '4' + + \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/MenuButtonInfoMapper.java b/src/main/java/com/soft/line/mapper/MenuButtonInfoMapper.java index 05be793..eeac1dd 100644 --- a/src/main/java/com/soft/line/mapper/MenuButtonInfoMapper.java +++ b/src/main/java/com/soft/line/mapper/MenuButtonInfoMapper.java @@ -1,8 +1,13 @@ package com.soft.line.mapper; import com.soft.line.entity.MenuButtonInfo; +import org.apache.ibatis.annotations.Delete; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + import java.util.List; +@Mapper public interface MenuButtonInfoMapper { /** * This method was generated by MyBatis Generator. @@ -12,6 +17,12 @@ public interface MenuButtonInfoMapper { */ int insert(MenuButtonInfo record); + @Delete("delete from menu_button_info where menu_id=#{menuId} and button_id=#{buttonId}") + int delete(@Param("menuId") int menuId,@Param("buttonId") String buttonId); + + @Delete("delete from role_menu where menu_button_id = (select mbi.id from menu_button_info mbi where mbi.menu_id=#{menuId} and mbi.button_id=#{buttonId})") + int deleteRoleMenu(@Param("menuId") int menuId,@Param("buttonId") String buttonId); + /** * This method was generated by MyBatis Generator. * This method corresponds to the database table menu_button_info @@ -27,6 +38,4 @@ public interface MenuButtonInfoMapper { * @mbggenerated */ List selectAll(); - - List selectAllByMenuId(Integer menuId); } \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/MenuButtonInfoMapper.xml b/src/main/java/com/soft/line/mapper/MenuButtonInfoMapper.xml index edc67ca..3529a77 100644 --- a/src/main/java/com/soft/line/mapper/MenuButtonInfoMapper.xml +++ b/src/main/java/com/soft/line/mapper/MenuButtonInfoMapper.xml @@ -1,33 +1,71 @@ - - - - - - - - - + + + + + + + + + + - + + + insert into `menu_button_info` (`menu_id`, `button_id`, `modify_person`, + `modify_time`) + values (#{menuId,jdbcType=INTEGER}, #{buttonId,jdbcType=VARCHAR}, #{modifyPerson,jdbcType=VARCHAR}, + #{modifyTime,jdbcType=TIMESTAMP}) + + + + + + + + + + + insert into `menu_button_info` (`menu_id`, `button_id`, `modify_person`, `modify_time`) values (#{menuId,jdbcType=INTEGER}, #{buttonId,jdbcType=VARCHAR}, #{modifyPerson,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}) - select `id`, `menu_id`, `button_id`, `modify_person`, `modify_time` from `menu_button_info` where `id` = #{id,jdbcType=INTEGER} - select `id`, `menu_id`, `button_id`, `modify_person`, `modify_time` from `menu_button_info` - select t.`id`, t.`menu_id`, cd.code_content1 as button_id, t.`modify_person`, t.`modify_time` from `menu_button_info` t left join code_detail cd on cd.code_type='4' and cd.code_detail = t.button_id where `menu_id` = #{menuId} diff --git a/src/main/java/com/soft/line/mapper/MenuInfoMapper.java b/src/main/java/com/soft/line/mapper/MenuInfoMapper.java index 7308d4f..7010a0c 100644 --- a/src/main/java/com/soft/line/mapper/MenuInfoMapper.java +++ b/src/main/java/com/soft/line/mapper/MenuInfoMapper.java @@ -1,10 +1,14 @@ package com.soft.line.mapper; import com.soft.line.entity.MenuInfo; +import org.apache.ibatis.annotations.Delete; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import java.util.List; +@Mapper public interface MenuInfoMapper { /** * This method was generated by MyBatis Generator. @@ -14,6 +18,15 @@ public interface MenuInfoMapper { */ int insert(MenuInfo record); + int update(MenuInfo record); + + @Delete("delete from menu_info where id = #{id}") + int delete(Integer id); + + int deleteMenuButtonInfo(Integer menuId); + + int deleteRoleMenu(Integer menuId); + /** * This method was generated by MyBatis Generator. * This method corresponds to the database table menu_info @@ -29,4 +42,14 @@ public interface MenuInfoMapper { * @mbggenerated */ List selectAll(); + + int countMenuName(String menuName); + + @Select("select menu_name from menu_info") + List selectALlMenuName(); + + @Select("select * from menu_info where menu_name = #{menuName}") + MenuInfo selectAllByMenuName(String menuName); + + } \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/MenuInfoMapper.xml b/src/main/java/com/soft/line/mapper/MenuInfoMapper.xml index c16636e..8fbdd28 100644 --- a/src/main/java/com/soft/line/mapper/MenuInfoMapper.xml +++ b/src/main/java/com/soft/line/mapper/MenuInfoMapper.xml @@ -17,14 +17,36 @@ - insert into `menu_info` (`menu_icon`, `menu_name`, `state`, + insert into `menu_info` (`menu_icon`, `menu_name`, `state`, `menu_url`, `orderby`, `p_id`, `modify_person`, `modify_time`) - values (#{menuIcon,jdbcType=VARCHAR}, #{menuName,jdbcType=VARCHAR}, #{state,jdbcType=INTEGER}, + values (#{menuIcon,jdbcType=VARCHAR}, #{menuName,jdbcType=VARCHAR}, #{state,jdbcType=INTEGER}, #{menuUrl,jdbcType=VARCHAR}, #{orderby,jdbcType=VARCHAR}, #{pId,jdbcType=INTEGER}, #{modifyPerson,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}) + + update `menu_info` set `menu_icon` = #{menuIcon,jdbcType=VARCHAR} , + `menu_name` = #{menuName,jdbcType=VARCHAR}, + `state` = #{state,jdbcType=INTEGER}, + `menu_url` = #{menuUrl,jdbcType=VARCHAR}, + `orderby` = #{orderby,jdbcType=VARCHAR}, + `p_id` = #{pId,jdbcType=INTEGER}, + `modify_person` = #{modifyPerson,jdbcType=VARCHAR}, + `modify_time` = #{modifyTime,jdbcType=TIMESTAMP}) + where `id` = #{id,jdbcType=INTEGER} + + + + delete from menu_button_info where menu_id =(select from menu_info mi where mi.id=#{menuId}) + + + + delete from role_menu + where menu_button_id = (select mbi.id from menu_button_info mbi + where mbi.menu_id =(select from menu_info mi where mi.id=#{menuId})) + + - + select `id`, `menu_icon`, `menu_name`, `state`, `menu_url`, `orderby`, `p_id`, `modify_person`, `modify_time` from `menu_info` + + + + + + \ No newline at end of file diff --git a/src/main/java/com/soft/line/service/MenuInfoService.java b/src/main/java/com/soft/line/service/MenuInfoService.java index 8b5270d..9251103 100644 --- a/src/main/java/com/soft/line/service/MenuInfoService.java +++ b/src/main/java/com/soft/line/service/MenuInfoService.java @@ -1,6 +1,7 @@ package com.soft.line.service; import com.github.pagehelper.PageInfo; +import com.soft.line.entity.ButtonInfo; import com.soft.line.entity.MenuButtonInfo; import com.soft.line.entity.MenuInfo; @@ -11,5 +12,19 @@ public interface MenuInfoService { public PageInfo selectAll(final Map map); - public List selectAllByMenuId(Integer menuId); + public List selectButtonsByMenuId(Integer menuId); + + public MenuInfo selectByPrimaryKey(Integer id); + + public int countMenuName(String menuName); + + public List selectALlMenuName(); + + public MenuInfo selectAllByMenuName(String menuMane); + + public void addMenuInfo(MenuInfo menuInfo); + + public void updateMenInfo(MenuInfo menuInfo); + + public void delete(Integer id); } diff --git a/src/main/java/com/soft/line/service/impl/MenuInfoServiceImpl.java b/src/main/java/com/soft/line/service/impl/MenuInfoServiceImpl.java index 507c0d6..f820ccf 100644 --- a/src/main/java/com/soft/line/service/impl/MenuInfoServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/MenuInfoServiceImpl.java @@ -1,8 +1,10 @@ package com.soft.line.service.impl; import com.github.pagehelper.PageInfo; +import com.soft.line.entity.ButtonInfo; import com.soft.line.entity.MenuButtonInfo; import com.soft.line.entity.MenuInfo; +import com.soft.line.mapper.ButtonInfoMapper; import com.soft.line.mapper.MenuButtonInfoMapper; import com.soft.line.mapper.MenuInfoMapper; import com.soft.line.service.MenuInfoService; @@ -10,7 +12,10 @@ import com.soft.line.util.pagehelper.PageUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; +import java.util.Date; import java.util.List; import java.util.Map; @@ -21,21 +26,97 @@ public class MenuInfoServiceImpl implements MenuInfoService { @Autowired private MenuInfoMapper menuInfoMapper; @Autowired + private ButtonInfoMapper buttonInfoMapper; + @Autowired private MenuButtonInfoMapper menuButtonInfoMapper; @Override public PageInfo selectAll(final Map map) { PageUtil.setPageParam(map); List menuInfoList = menuInfoMapper.selectAll(); - for (MenuInfo mi:menuInfoList) { - mi.setMenuButtonInfoList(selectAllByMenuId(mi.getId())); + for (MenuInfo menuInfo:menuInfoList) { + menuInfo.setButtonInfoList(selectButtonsByMenuId(menuInfo.getId())); } PageInfo menuInfoPage =new PageInfo(menuInfoList); return menuInfoPage; } @Override - public List selectAllByMenuId(Integer menuId) { - return menuButtonInfoMapper.selectAllByMenuId(menuId); + public List selectButtonsByMenuId(Integer menuId) { + return buttonInfoMapper.selectButtonsByMenuId(menuId); + } + + @Override + public MenuInfo selectByPrimaryKey(Integer id) { + MenuInfo menuInfo = menuInfoMapper.selectByPrimaryKey(id); + menuInfo.setButtonInfoList(buttonInfoMapper.selectButtonsByMenuId((id))); + return menuInfo; + } + + @Override + public int countMenuName(String menuName) { + return menuInfoMapper.countMenuName(menuName); + } + + @Override + public List selectALlMenuName() { + return menuInfoMapper.selectALlMenuName(); + } + + @Override + public MenuInfo selectAllByMenuName(String menuMane) { + return menuInfoMapper.selectAllByMenuName(menuMane); + } + + @Override + public void addMenuInfo(MenuInfo menuInfo) { + menuInfoMapper.insert(menuInfo); + for (ButtonInfo buttonInfo : menuInfo.getButtonInfoList()) { + MenuButtonInfo menuButtonInfo = new MenuButtonInfo(); + menuButtonInfo.setMenuId(menuInfo.getId()); + menuButtonInfo.setButtonId(buttonInfo.getButtonId()); + menuButtonInfo.setModifyPerson(menuInfo.getModifyPerson()); + menuButtonInfo.setModifyTime(new Date()); + menuButtonInfoMapper.insert(menuButtonInfo); + } + } + + @Override + public void updateMenInfo(MenuInfo menuInfo) { + menuInfoMapper.update(menuInfo); + List oldButtonList = buttonInfoMapper.selectButtonsByMenuId(menuInfo.getId()); + List newButtonList = menuInfo.getButtonInfoList(); + //旧的比新的多，删除旧的 + List dealOldButtonList = getDiffrent(oldButtonList,newButtonList); + for (ButtonInfo buttonInfo : dealOldButtonList) { + menuButtonInfoMapper.deleteRoleMenu(menuInfo.getId(),buttonInfo.getButtonId()); + menuButtonInfoMapper.delete(menuInfo.getId(),buttonInfo.getButtonId()); + } + //新的比旧的多，新增新的 + List dealNewButtonList = getDiffrent(newButtonList,oldButtonList); + for (ButtonInfo buttonInfo : dealNewButtonList) { + MenuButtonInfo menuButtonInfo = new MenuButtonInfo(); + menuButtonInfo.setMenuId(menuInfo.getId()); + menuButtonInfo.setButtonId(buttonInfo.getButtonId()); + menuButtonInfo.setModifyPerson(menuInfo.getModifyPerson()); + menuButtonInfo.setModifyTime(new Date()); + menuButtonInfoMapper.insert(menuButtonInfo); + } + } + + @Override + @Transactional + public void delete(Integer id) { + menuInfoMapper.deleteRoleMenu(id); + menuInfoMapper.deleteMenuButtonInfo(id); + menuInfoMapper.delete(id); + } + + //取两个list的差集 + private static List getDiffrent(List list1, List list2) { + List list3 = new ArrayList(); + list3.addAll(list1); + list3.removeAll(list2); + return list3; } } diff --git a/src/main/java/com/soft/line/util/generator/mybatis-generator.xml b/src/main/java/com/soft/line/util/generator/mybatis-generator.xml index 3f0439c..0e02425 100644 --- a/src/main/java/com/soft/line/util/generator/mybatis-generator.xml +++ b/src/main/java/com/soft/line/util/generator/mybatis-generator.xml @@ -174,7 +174,7 @@ delimitIdentifiers="true" delimitAllColumns="true"> - --> + -
+ -->
- -
+ --> \ No newline at end of file diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index f6a6dfe..c5f6d96 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,6 +1,6 @@ server.port=9100 server.servlet.context-path=/softline -spring.datasource.url= jdbc:mysql://localhost:3306/rz_archives +spring.datasource.url= jdbc:mysql://localhost:3306/rz_archives?characterEncoding=utf-8 spring.datasource.username=root spring.datasource.password=root spring.datasource.driver-class-name=com.mysql.jdbc.Driver -- Gitee From 82f912975de76dba7e29d4a05a76785b69f2e071 Mon Sep 17 00:00:00 2001 From: wuxueqiao <17625808004@163.com> Date: Mon, 25 May 2020 10:26:12 +0800 Subject: [PATCH 033/211] =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=8C=85=E8=A3=85=20?= =?UTF-8?q?=E5=8F=82=E6=95=B0=20data--->=20result?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../line/util/exception/CommonResult.java | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/soft/line/util/exception/CommonResult.java b/src/main/java/com/soft/line/util/exception/CommonResult.java index 62af127..42e9215 100644 --- a/src/main/java/com/soft/line/util/exception/CommonResult.java +++ b/src/main/java/com/soft/line/util/exception/CommonResult.java @@ -15,7 +15,7 @@ import lombok.NoArgsConstructor; public class CommonResult { private Integer code; private String msg; - private T data; + private T result; public CommonResult(Integer code, String msg) { this.code = code; @@ -25,24 +25,24 @@ public class CommonResult { /** * 成功返回结果 * - * @param data 获取的数据 + * @param result 获取的数据 * @param * @return */ - public static CommonResult success(T data) { - return new CommonResult(ResultCode.SUCCESS.getCode(), ResultCode.SUCCESS.getMessage(), data); + public static CommonResult success(T result) { + return new CommonResult(ResultCode.SUCCESS.getCode(), ResultCode.SUCCESS.getMessage(), result); } /** * 成功返回结果 * - * @param data 获取的数据 + * @param result 获取的数据 * @param message 提示信息 * @param * @return */ - public static CommonResult success(T data, String message) { - return new CommonResult(ResultCode.SUCCESS.getCode(), message, data); + public static CommonResult success(T result, String message) { + return new CommonResult(ResultCode.SUCCESS.getCode(), message, result); } /** @@ -114,22 +114,22 @@ public class CommonResult { /** * 未登录返回结果 * - * @param data 获取的数据 + * @param result 获取的数据 * @param * @return */ - public static CommonResult unauthorized(T data) { - return new CommonResult(ResultCode.UNAUTHORIZED.getCode(), ResultCode.UNAUTHORIZED.getMessage(), data); + public static CommonResult unauthorized(T result) { + return new CommonResult(ResultCode.UNAUTHORIZED.getCode(), ResultCode.UNAUTHORIZED.getMessage(), result); } /** * 未授权返回结果 * - * @param data 获取的数据 + * @param result 获取的数据 * @param * @return */ - public static CommonResult forbidden(T data) { - return new CommonResult(ResultCode.FORBIDDEN.getCode(), ResultCode.FORBIDDEN.getMessage(), data); + public static CommonResult forbidden(T result) { + return new CommonResult(ResultCode.FORBIDDEN.getCode(), ResultCode.FORBIDDEN.getMessage(), result); } } -- Gitee From 27f24703f1e1b6550744211746df9652877a593f Mon Sep 17 00:00:00 2001 From: wuxueqiao <17625808004@163.com> Date: Mon, 25 May 2020 11:15:57 +0800 Subject: [PATCH 034/211] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86=20?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../line/controller/UserInfoController.java | 57 ++++++ .../java/com/soft/line/entity/UserInfo.java | 169 ++---------------- .../com/soft/line/mapper/UserInfoMapper.java | 8 +- .../com/soft/line/mapper/UserInfoMapper.xml | 63 +++++-- .../soft/line/service/UserInfoService.java | 13 +- .../service/impl/UserInfoServiceImpl.java | 39 ++++ 6 files changed, 183 insertions(+), 166 deletions(-) create mode 100644 src/main/java/com/soft/line/controller/UserInfoController.java diff --git a/src/main/java/com/soft/line/controller/UserInfoController.java b/src/main/java/com/soft/line/controller/UserInfoController.java new file mode 100644 index 0000000..8825ba2 --- /dev/null +++ b/src/main/java/com/soft/line/controller/UserInfoController.java @@ -0,0 +1,57 @@ +package com.soft.line.controller; + +import com.soft.line.entity.UserInfo; +import com.soft.line.service.UserInfoService; +import com.soft.line.util.exception.CommonResult; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.Map; + +/** + * @author wu.xueqiao on 2020/5/22. + * @version 0.1 + */ +@RestController +@RequestMapping("/user") +public class UserInfoController { + + + @Autowired + private UserInfoService userInfoService; + + /** + * 添加&&修改用户 + * @param userInfo + * @return + */ + @PostMapping("/addUser") + public CommonResult addUser(@RequestBody UserInfo userInfo){ + int result=userInfoService.addUser(userInfo); + if(result==1){ + return CommonResult.success(null); + }else { + return CommonResult.failed(); + } + } + + @PostMapping("/getAllUsers") + public CommonResult getAllUsers(@RequestBody Map map){ + return CommonResult.success(userInfoService.getAllUsers(map)); + } + + @DeleteMapping("/delUser") + public CommonResult delUser(@RequestParam("id") int id){ + int result=userInfoService.delUser(id); + if(result==1){ + return CommonResult.success(null); + }else { + return CommonResult.failed(); + } + } + + @GetMapping("/getUserInfo") + public CommonResult getUserInfo(@RequestParam("id") int id){ + return CommonResult.success(userInfoService.getUserInfo(id)); + } +} diff --git a/src/main/java/com/soft/line/entity/UserInfo.java b/src/main/java/com/soft/line/entity/UserInfo.java index 6267a2e..876041b 100644 --- a/src/main/java/com/soft/line/entity/UserInfo.java +++ b/src/main/java/com/soft/line/entity/UserInfo.java @@ -1,7 +1,10 @@ package com.soft.line.entity; +import lombok.Data; + import java.util.Date; +@Data public class UserInfo { /** * This field was generated by MyBatis Generator. @@ -9,7 +12,7 @@ public class UserInfo { * * @mbggenerated */ - private Long id; + private Integer id; /** * This field was generated by MyBatis Generator. @@ -35,14 +38,6 @@ public class UserInfo { */ private String phone; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column user_info.privilege - * - * @mbggenerated - */ - private Integer privilege; - /** * This field was generated by MyBatis Generator. * This field corresponds to the database column user_info.modify_person @@ -60,170 +55,44 @@ public class UserInfo { private Date modifyTime; /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column user_info.id - * - * @return the value of user_info.id - * - * @mbggenerated - */ - public Long getId() { - return id; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column user_info.id - * - * @param id the value for user_info.id - * - * @mbggenerated - */ - public void setId(Long id) { - this.id = id; - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column user_info.user_name - * - * @return the value of user_info.user_name - * - * @mbggenerated - */ - public String getUserName() { - return userName; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column user_info.user_name - * - * @param userName the value for user_info.user_name - * - * @mbggenerated - */ - public void setUserName(String userName) { - this.userName = userName == null ? null : userName.trim(); - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column user_info.password - * - * @return the value of user_info.password - * - * @mbggenerated - */ - public String getPassword() { - return password; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column user_info.password - * - * @param password the value for user_info.password - * - * @mbggenerated - */ - public void setPassword(String password) { - this.password = password == null ? null : password.trim(); - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column user_info.phone - * - * @return the value of user_info.phone - * - * @mbggenerated - */ - public String getPhone() { - return phone; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column user_info.phone - * - * @param phone the value for user_info.phone + * This field was generated by MyBatis Generator. + * This field corresponds to the database column user_info.head_img_url * * @mbggenerated */ - public void setPhone(String phone) { - this.phone = phone == null ? null : phone.trim(); - } + private String headImgUrl; /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column user_info.privilege - * - * @return the value of user_info.privilege + * This field was generated by MyBatis Generator. + * This field corresponds to the database column user_info.user_status * * @mbggenerated */ - public Integer getPrivilege() { - return privilege; - } + private String userStatus; /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column user_info.privilege - * - * @param privilege the value for user_info.privilege + * This field was generated by MyBatis Generator. + * This field corresponds to the database column user_info.role_id * * @mbggenerated */ - public void setPrivilege(Integer privilege) { - this.privilege = privilege; - } + private Integer roleId; /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column user_info.modify_person - * - * @return the value of user_info.modify_person + * This field was generated by MyBatis Generator. + * This field corresponds to the database column user_info.salt * * @mbggenerated */ - public String getModifyPerson() { - return modifyPerson; - } + private String salt; /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column user_info.modify_person - * - * @param modifyPerson the value for user_info.modify_person + * This field was generated by MyBatis Generator. + * This field corresponds to the database column user_info.open_id * * @mbggenerated */ - public void setModifyPerson(String modifyPerson) { - this.modifyPerson = modifyPerson == null ? null : modifyPerson.trim(); - } + private String openId; - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column user_info.modify_time - * - * @return the value of user_info.modify_time - * - * @mbggenerated - */ - public Date getModifyTime() { - return modifyTime; - } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column user_info.modify_time - * - * @param modifyTime the value for user_info.modify_time - * - * @mbggenerated - */ - public void setModifyTime(Date modifyTime) { - this.modifyTime = modifyTime; - } } \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/UserInfoMapper.java b/src/main/java/com/soft/line/mapper/UserInfoMapper.java index 8fa879e..49c98db 100644 --- a/src/main/java/com/soft/line/mapper/UserInfoMapper.java +++ b/src/main/java/com/soft/line/mapper/UserInfoMapper.java @@ -1,12 +1,10 @@ package com.soft.line.mapper; import com.soft.line.entity.UserInfo; -import org.apache.ibatis.annotations.Mapper; import java.util.List; import java.util.Map; -@Mapper public interface UserInfoMapper { /** * This method was generated by MyBatis Generator. @@ -33,4 +31,10 @@ public interface UserInfoMapper { List selectAll(); UserInfo userLogin(Map map); + + List getAllUsers(Map map); + + int delUser(int id); + + int updateUserInfo(UserInfo userInfo); } \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/UserInfoMapper.xml b/src/main/java/com/soft/line/mapper/UserInfoMapper.xml index e17e725..7c3ecd9 100644 --- a/src/main/java/com/soft/line/mapper/UserInfoMapper.xml +++ b/src/main/java/com/soft/line/mapper/UserInfoMapper.xml @@ -10,28 +10,35 @@ - + + + + + - insert into `user_info` (`user_name`, `password`, `phone`, - `privilege`, `modify_person`, `modify_time` - ) - values (#{userName,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR}, #{phone,jdbcType=VARCHAR}, - #{privilege,jdbcType=INTEGER}, #{modifyPerson,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP} - ) + insert into `user_info` (`user_name`, `password`, `phone`, + `modify_person`, `modify_time`, `head_img_url`, + `user_status`, `role_id`, `salt`, + `open_id`) + values (#{userName,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR}, #{phone,jdbcType=VARCHAR}, + #{modifyPerson,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}, #{headImgUrl,jdbcType=VARCHAR}, + #{userStatus,jdbcType=VARCHAR}, #{roleId,jdbcType=INTEGER}, #{salt,jdbcType=VARCHAR}, + #{openId,jdbcType=VARCHAR}) - - select `id`, `user_name`, `password`, `phone`, `privilege`, `modify_person`, `modify_time` + select `id`, `user_name`, `password`, `phone`, `modify_person`, `modify_time`, `head_img_url`, + `user_status`, `role_id`, `salt`, `open_id` from `user_info` where `id` = #{id,jdbcType=INTEGER} @@ -40,16 +47,46 @@ WARNING - @mbggenerated This element is automatically generated by MyBatis Generator, do not modify. --> - select `id`, `user_name`, `password`, `phone`, `privilege`, `modify_person`, `modify_time` + select `id`, `user_name`, `password`, `phone`, `modify_person`, `modify_time`, `head_img_url`, + `user_status`, `role_id`, `salt`, `open_id` from `user_info` - + + select `id`, `user_name`, `password`, `phone`, `modify_person`, `modify_time`, `head_img_url`, + `user_status`, `role_id`, `salt`, `open_id` from `user_info` WHERE `user_name`=#{username,jdbcType=VARCHAR} - AND + and `password`=#{password,jdbcType=VARCHAR} + + + UPDATE `user_info` + SET `user_status`=2 + WHERE `id`=#{id,jdbdType=INTEGER} + + + + UPDATE `user_info` + + `user_name`=#{userName,jdbcType=VARCHAR} + `password`=#{password,jdbcType=VARCHAR} + `phone`=#{phone,jdbcType=VARCHAR} + `modify_person`=#{modifyPerson,jdbcType=VARCHAR} + `head_img_url`=#{headImgUrl,jdbcType=VARCHAR} + `user_status`=#{userStatus,jdbcType=VARCHAR} + `role_id`=#{roleId,jdbcType=INTEGER} + + WHERE `id`=#{id,jdbdType=INTEGER} + \ No newline at end of file diff --git a/src/main/java/com/soft/line/service/UserInfoService.java b/src/main/java/com/soft/line/service/UserInfoService.java index 4eb44a8..2d61314 100644 --- a/src/main/java/com/soft/line/service/UserInfoService.java +++ b/src/main/java/com/soft/line/service/UserInfoService.java @@ -1,12 +1,23 @@ package com.soft.line.service; +import com.github.pagehelper.PageInfo; import com.soft.line.entity.UserInfo; +import java.util.List; +import java.util.Map; + /** * @author wu.xueqiao on 2020/5/12. * @version 0.1 */ public interface UserInfoService { - public UserInfo getUserInfo(int userId); + UserInfo getUserInfo(int userId); + + PageInfo getAllUsers(Map map); + + int delUser(int id); + + int addUser(UserInfo userInfo); + } diff --git a/src/main/java/com/soft/line/service/impl/UserInfoServiceImpl.java b/src/main/java/com/soft/line/service/impl/UserInfoServiceImpl.java index 69f303b..844064c 100644 --- a/src/main/java/com/soft/line/service/impl/UserInfoServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/UserInfoServiceImpl.java @@ -1,11 +1,17 @@ package com.soft.line.service.impl; + +import com.github.pagehelper.PageInfo; import com.soft.line.entity.UserInfo; import com.soft.line.mapper.UserInfoMapper; import com.soft.line.service.UserInfoService; +import com.soft.line.util.pagehelper.PageUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; +import java.util.Map; + /** * @author wu.xueqiao on 2020/5/12. * @version 0.1 @@ -15,8 +21,41 @@ public class UserInfoServiceImpl implements UserInfoService { @Autowired private UserInfoMapper userInfoMapper; + + @Override public UserInfo getUserInfo(int userId) { return userInfoMapper.selectByPrimaryKey(userId); } + + @Override + public PageInfo getAllUsers(Map map) { + PageUtil.setPageParam(map); + List userInfos=userInfoMapper.getAllUsers(map); + PageInfo beans = new PageInfo(userInfos); + beans.setList(userInfos); + return beans; + } + + @Override + public int delUser(int id) { + int result=userInfoMapper.delUser(id); + if(result==1){ + return 1; + }else { + return 0; + } + } + + @Override + public int addUser(UserInfo userInfo) { + if (userInfo.getId()==null){ + return userInfoMapper.insert(userInfo); + }else { + return userInfoMapper.updateUserInfo(userInfo); + } + + } + + } -- Gitee From 9837530a4c576e9ff32eb80160326628455cb80d Mon Sep 17 00:00:00 2001 From: wuxueqiao <17625808004@163.com> Date: Mon, 25 May 2020 13:37:50 +0800 Subject: [PATCH 035/211] =?UTF-8?q?=E5=90=88=E5=90=8C=E6=A8=A1=E7=B3=8A?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/soft/line/controller/ContractInfoController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/soft/line/controller/ContractInfoController.java b/src/main/java/com/soft/line/controller/ContractInfoController.java index 9d98642..482b91e 100644 --- a/src/main/java/com/soft/line/controller/ContractInfoController.java +++ b/src/main/java/com/soft/line/controller/ContractInfoController.java @@ -22,7 +22,7 @@ public class ContractInfoController { @Autowired private ContractInfoService contractInfoService; - @PostMapping + @PostMapping("/getAllAboutContracts") public CommonResult getAllAboutContracts(@RequestBody Map map){ return CommonResult.success(contractInfoService.getAllAboutContracts(map)); } -- Gitee From 388fe751ce5d8141458db17f387f76f34ef2809b Mon Sep 17 00:00:00 2001 From: wuxueqiao <17625808004@163.com> Date: Mon, 25 May 2020 14:28:27 +0800 Subject: [PATCH 036/211] =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/soft/line/controller/UserInfoController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/soft/line/controller/UserInfoController.java b/src/main/java/com/soft/line/controller/UserInfoController.java index 8825ba2..9e398ca 100644 --- a/src/main/java/com/soft/line/controller/UserInfoController.java +++ b/src/main/java/com/soft/line/controller/UserInfoController.java @@ -29,7 +29,7 @@ public class UserInfoController { public CommonResult addUser(@RequestBody UserInfo userInfo){ int result=userInfoService.addUser(userInfo); if(result==1){ - return CommonResult.success(null); + return CommonResult.success(200,"增加用户成功"); }else { return CommonResult.failed(); } @@ -44,7 +44,7 @@ public class UserInfoController { public CommonResult delUser(@RequestParam("id") int id){ int result=userInfoService.delUser(id); if(result==1){ - return CommonResult.success(null); + return CommonResult.success(200,"删除用户成功"); }else { return CommonResult.failed(); } -- Gitee From 8b55b4b9e69aeac6638e1676c34714268b9c5ae8 Mon Sep 17 00:00:00 2001 From: wuxueqiao <17625808004@163.com> Date: Mon, 25 May 2020 16:07:32 +0800 Subject: [PATCH 037/211] =?UTF-8?q?=E7=89=B9=E6=AE=8A=E6=9D=83=E9=99=90?= =?UTF-8?q?=E8=AE=A4=E8=AF=81=20=E8=8F=9C=E5=8D=95=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/soft/line/aop/PermissionAspect.java | 43 ++++++++++++++++--- .../line/controller/MenuInfoController.java | 23 +++++++--- .../line/controller/UserInfoController.java | 12 +++++- .../soft/line/filter/ConfigurationFilter.java | 4 +- .../java/com/soft/line/filter/GsonUtil.java | 3 +- .../com/soft/line/filter/HttpRequestUtil.java | 6 ++- .../com/soft/line/filter/UserTokenDto.java | 34 ++++++++++++++- .../com/soft/line/mapper/MenuInfoMapper.java | 2 + .../com/soft/line/mapper/MenuInfoMapper.xml | 7 +++ .../com/soft/line/mapper/UserInfoMapper.xml | 2 +- .../soft/line/service/MenuInfoService.java | 2 + .../service/impl/MenuInfoServiceImpl.java | 5 +++ 12 files changed, 123 insertions(+), 20 deletions(-) diff --git a/src/main/java/com/soft/line/aop/PermissionAspect.java b/src/main/java/com/soft/line/aop/PermissionAspect.java index ed484ed..47443ce 100644 --- a/src/main/java/com/soft/line/aop/PermissionAspect.java +++ b/src/main/java/com/soft/line/aop/PermissionAspect.java @@ -1,15 +1,28 @@ package com.soft.line.aop; -import com.soft.line.entity.UserInfoToken; + +import com.fasterxml.jackson.databind.ObjectMapper; +import com.soft.line.entity.UserInfo; import com.soft.line.filter.HttpRequestUtil; import com.soft.line.filter.UserTokenDto; +import com.soft.line.mapper.UserInfoMapper; +import com.soft.line.util.exception.CommonResult; import lombok.extern.slf4j.Slf4j; -import org.apache.coyote.Response; +import net.bytebuddy.implementation.bytecode.Throw; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Aspect; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.context.request.RequestAttributes; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; + +import javax.servlet.http.HttpServletResponse; +import java.io.OutputStream; +import java.util.HashMap; +import java.util.Map; /** * @author wu.xueqiao on 2020/5/12. @@ -23,10 +36,12 @@ import org.springframework.web.bind.annotation.ResponseBody; public class PermissionAspect { + @Autowired + private UserInfoMapper userInfoMapper; //环绕通知 @Around(value="@annotation(permission)") - public void checkPermission(ProceedingJoinPoint joinPoint, Permission permission) throws Throwable{ + public Object checkPermission(ProceedingJoinPoint joinPoint, Permission permission) throws Throwable{ //获取请求session中的人员信息，判断人员所具有的权限，权限符合则继续，不符合则抛出相关提醒； log.info("------开始校验权限------"); //获取请求参数 @@ -34,11 +49,27 @@ public class PermissionAspect { log.info("---"+objects[0]+"----"); //获取请求客户端的个人信息 UserTokenDto userToken=HttpRequestUtil.getUserToken(); - //根据角色,编辑业务逻辑。。。。。 - if(objects[0].equals("www")){ + RequestAttributes requestAttributes = RequestContextHolder.getRequestAttributes(); + HttpServletResponse response=((ServletRequestAttributes)requestAttributes).getResponse(); + Map map=new HashMap<>(); + String userName=userToken.getUserName(); + String password=userToken.getPassword(); + map.put("username",userName); + map.put("password",password); + log.info(userToken.getUserName()); + //根据角色,编辑业务逻辑。。。。。 + UserInfo userInfo=userInfoMapper.userLogin(map); + Object o=null; + if(userInfo.getRoleId()==1){ + o=joinPoint.proceed(); + }else { + response.setHeader("Content-type","application/json; charset=UTF-8"); + OutputStream outputStream=response.getOutputStream(); + CommonResult commonResult=CommonResult.failed("err：您没有该权限"); + outputStream.write(new ObjectMapper().writeValueAsString(commonResult).getBytes("UTF-8")); } - + return o; } diff --git a/src/main/java/com/soft/line/controller/MenuInfoController.java b/src/main/java/com/soft/line/controller/MenuInfoController.java index fbdf0cd..2557fe2 100644 --- a/src/main/java/com/soft/line/controller/MenuInfoController.java +++ b/src/main/java/com/soft/line/controller/MenuInfoController.java @@ -2,11 +2,12 @@ package com.soft.line.controller; import com.soft.line.service.MenuInfoService; import com.soft.line.util.exception.CommonResult; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.Map; @@ -15,15 +16,27 @@ import java.util.Map; * @author wu.xueqiao on 2020/5/21. * @version 0.1 */ +@Api(description = "菜单接口") @RequestMapping("/menu") @RestController public class MenuInfoController { @Autowired private MenuInfoService menuInfoService; - + @ApiOperation(value = "菜单列表", notes = "查询角色对应菜单") + //设置请求参数 + @ApiImplicitParams({ + @ApiImplicitParam(paramType = "query", name = "username", value = "用户名", required = false, dataType = "String"), + @ApiImplicitParam(paramType = "query", name = "roleId", value = "角色ID", required = false, dataType = "int") + // ..... + }) @PostMapping("/getMyMenus") public CommonResult getAllMenuForRole(@RequestBody Map map){ return CommonResult.success(menuInfoService.getAllMenuForRole(map)); } + + @GetMapping("/getAllParentMenu") + public CommonResult getAllParentMenu(){ + return CommonResult.success(menuInfoService.getAllParentMenu()); + } } diff --git a/src/main/java/com/soft/line/controller/UserInfoController.java b/src/main/java/com/soft/line/controller/UserInfoController.java index 9e398ca..7c01a5a 100644 --- a/src/main/java/com/soft/line/controller/UserInfoController.java +++ b/src/main/java/com/soft/line/controller/UserInfoController.java @@ -1,5 +1,6 @@ package com.soft.line.controller; +import com.soft.line.aop.Permission; import com.soft.line.entity.UserInfo; import com.soft.line.service.UserInfoService; import com.soft.line.util.exception.CommonResult; @@ -29,7 +30,7 @@ public class UserInfoController { public CommonResult addUser(@RequestBody UserInfo userInfo){ int result=userInfoService.addUser(userInfo); if(result==1){ - return CommonResult.success(200,"增加用户成功"); + return CommonResult.success(null); }else { return CommonResult.failed(); } @@ -40,11 +41,18 @@ public class UserInfoController { return CommonResult.success(userInfoService.getAllUsers(map)); } + /** + * @Permission + * @Des 权限判定该 删除操作者 是否具有该权限 + * @param id + * @return + */ + @Permission @DeleteMapping("/delUser") public CommonResult delUser(@RequestParam("id") int id){ int result=userInfoService.delUser(id); if(result==1){ - return CommonResult.success(200,"删除用户成功"); + return CommonResult.success(null); }else { return CommonResult.failed(); } diff --git a/src/main/java/com/soft/line/filter/ConfigurationFilter.java b/src/main/java/com/soft/line/filter/ConfigurationFilter.java index 5036bdc..c0e176e 100644 --- a/src/main/java/com/soft/line/filter/ConfigurationFilter.java +++ b/src/main/java/com/soft/line/filter/ConfigurationFilter.java @@ -62,9 +62,9 @@ public class ConfigurationFilter { response.setHeader("Access-Control-Allow-Origin", "*"); response.setHeader("Access-Control-Allow-Methods", "POST,GET,PUT,OPTIONS,DELETE"); response.setHeader("Access-Control-Max-Age", "3600"); - response.setHeader("Access-Control-Allow-Headers", "Origin,X-Requested-With,Content-Type,Accept,Authorization,token"); + response.setHeader("Access-Control-Allow-Headers", "Origin,X-Requested-With,Content-Type,Accept,Access-Token,token"); final String uri = request.getRequestURI(); - String auth = request.getHeader("Authorization"); + String auth = request.getHeader("Access-Token"); Token token = null; if (!uri.contains("/login")) { if (auth == null || "".equals(auth)) { diff --git a/src/main/java/com/soft/line/filter/GsonUtil.java b/src/main/java/com/soft/line/filter/GsonUtil.java index 0c1b8db..901b305 100644 --- a/src/main/java/com/soft/line/filter/GsonUtil.java +++ b/src/main/java/com/soft/line/filter/GsonUtil.java @@ -1,7 +1,7 @@ package com.soft.line.filter; -import com.google.gson.Gson; +import com.google.gson.Gson; public class GsonUtil { public static String javabeanToJson(final UserTokenDto user) { @@ -15,4 +15,5 @@ public class GsonUtil { final UserTokenDto user = gson.fromJson(json, UserTokenDto.class); return user; } + } diff --git a/src/main/java/com/soft/line/filter/HttpRequestUtil.java b/src/main/java/com/soft/line/filter/HttpRequestUtil.java index 5a8d1b4..2dd2ddf 100644 --- a/src/main/java/com/soft/line/filter/HttpRequestUtil.java +++ b/src/main/java/com/soft/line/filter/HttpRequestUtil.java @@ -7,6 +7,7 @@ import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; import java.util.Enumeration; import java.util.HashMap; import java.util.Map; @@ -19,15 +20,16 @@ public class HttpRequestUtil { public static final String key = "SOFTLINE-BUILD"; - public static final Integer expire = 315360000; + public static final Integer expire = 3000*3; public static UserTokenDto getUserToken() { final RequestAttributes ra = RequestContextHolder.getRequestAttributes(); final ServletRequestAttributes sra = (ServletRequestAttributes) ra; final HttpServletRequest request = sra.getRequest(); + HttpSession session=request.getSession(); final Map map = getHeadersInfo(request); - String token = map.get("authorization"); + String token = map.get("access-token"); if (token == null || "".equals(token)) { token = request.getParameter("token"); } diff --git a/src/main/java/com/soft/line/filter/UserTokenDto.java b/src/main/java/com/soft/line/filter/UserTokenDto.java index 4b26dd4..953c6e2 100644 --- a/src/main/java/com/soft/line/filter/UserTokenDto.java +++ b/src/main/java/com/soft/line/filter/UserTokenDto.java @@ -6,11 +6,43 @@ import java.io.Serializable; import java.util.List; import java.util.Map; -@Data + public class UserTokenDto implements Serializable { private String userName; private String password; private String token; + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + public String getToken() { + return token; + } + + public void setToken(String token) { + this.token = token; + } + + @Override + public String toString() { + return "UserTokenDto{" + + "userName='" + userName + '\'' + + ", password='" + password + '\'' + + ", token='" + token + '\'' + + '}'; + } } diff --git a/src/main/java/com/soft/line/mapper/MenuInfoMapper.java b/src/main/java/com/soft/line/mapper/MenuInfoMapper.java index 91e33d1..e247728 100644 --- a/src/main/java/com/soft/line/mapper/MenuInfoMapper.java +++ b/src/main/java/com/soft/line/mapper/MenuInfoMapper.java @@ -30,4 +30,6 @@ public interface MenuInfoMapper { List selectAll(); List getAllMenuForRole(Map map); + + List getAllParentMenu(); } \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/MenuInfoMapper.xml b/src/main/java/com/soft/line/mapper/MenuInfoMapper.xml index fdd5169..84c9743 100644 --- a/src/main/java/com/soft/line/mapper/MenuInfoMapper.xml +++ b/src/main/java/com/soft/line/mapper/MenuInfoMapper.xml @@ -66,5 +66,12 @@ WHERE u.`role_id`=#{roleId,jdbcType=INTEGER} AND u.`user_name`=#{username,jdbcType=VARCHAR} + + \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/UserInfoMapper.xml b/src/main/java/com/soft/line/mapper/UserInfoMapper.xml index 7c3ecd9..7140ac4 100644 --- a/src/main/java/com/soft/line/mapper/UserInfoMapper.xml +++ b/src/main/java/com/soft/line/mapper/UserInfoMapper.xml @@ -73,7 +73,7 @@ UPDATE `user_info` SET `user_status`=2 - WHERE `id`=#{id,jdbdType=INTEGER} + WHERE `id`=#{id,jdbcType=INTEGER} diff --git a/src/main/java/com/soft/line/service/MenuInfoService.java b/src/main/java/com/soft/line/service/MenuInfoService.java index 470e69a..3773ea3 100644 --- a/src/main/java/com/soft/line/service/MenuInfoService.java +++ b/src/main/java/com/soft/line/service/MenuInfoService.java @@ -12,4 +12,6 @@ import java.util.Map; public interface MenuInfoService { public List getAllMenuForRole(Map map); + + public List getAllParentMenu(); } diff --git a/src/main/java/com/soft/line/service/impl/MenuInfoServiceImpl.java b/src/main/java/com/soft/line/service/impl/MenuInfoServiceImpl.java index 849021c..562f2e2 100644 --- a/src/main/java/com/soft/line/service/impl/MenuInfoServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/MenuInfoServiceImpl.java @@ -24,4 +24,9 @@ public class MenuInfoServiceImpl implements MenuInfoService { public List getAllMenuForRole(Map map) { return menuInfoMapper.getAllMenuForRole(map); } + + @Override + public List getAllParentMenu() { + return menuInfoMapper.getAllParentMenu(); + } } -- Gitee From 8967fac341e4f61980a7b234aab54baa77de3fe4 Mon Sep 17 00:00:00 2001 From: wuxueqiao <17625808004@163.com> Date: Mon, 25 May 2020 16:36:16 +0800 Subject: [PATCH 038/211] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E7=99=BB=E5=87=BA?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/soft/line/aop/PermissionAspect.java | 6 ++---- .../soft/line/controller/LoginController.java | 15 ++++++++++----- .../com/soft/line/filter/HttpRequestUtil.java | 7 +++---- .../com/soft/line/service/LoginService.java | 2 ++ .../line/service/impl/LoginServiceImpl.java | 17 ++++++++++++++++- .../line/service/impl/UserInfoServiceImpl.java | 4 ++++ .../line/util/generator/mybatis-generator.xml | 2 +- 7 files changed, 38 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/soft/line/aop/PermissionAspect.java b/src/main/java/com/soft/line/aop/PermissionAspect.java index 47443ce..47d14a4 100644 --- a/src/main/java/com/soft/line/aop/PermissionAspect.java +++ b/src/main/java/com/soft/line/aop/PermissionAspect.java @@ -44,14 +44,10 @@ public class PermissionAspect { public Object checkPermission(ProceedingJoinPoint joinPoint, Permission permission) throws Throwable{ //获取请求session中的人员信息，判断人员所具有的权限，权限符合则继续，不符合则抛出相关提醒； log.info("------开始校验权限------"); - //获取请求参数 - Object[] objects= joinPoint.getArgs(); - log.info("---"+objects[0]+"----"); //获取请求客户端的个人信息 UserTokenDto userToken=HttpRequestUtil.getUserToken(); RequestAttributes requestAttributes = RequestContextHolder.getRequestAttributes(); HttpServletResponse response=((ServletRequestAttributes)requestAttributes).getResponse(); - Map map=new HashMap<>(); String userName=userToken.getUserName(); String password=userToken.getPassword(); @@ -61,7 +57,9 @@ public class PermissionAspect { //根据角色,编辑业务逻辑。。。。。 UserInfo userInfo=userInfoMapper.userLogin(map); Object o=null; + //判断该 用户 的角色id if(userInfo.getRoleId()==1){ + //符合角色要求 继续执行 o=joinPoint.proceed(); }else { response.setHeader("Content-type","application/json; charset=UTF-8"); diff --git a/src/main/java/com/soft/line/controller/LoginController.java b/src/main/java/com/soft/line/controller/LoginController.java index f01b70b..f6d5338 100644 --- a/src/main/java/com/soft/line/controller/LoginController.java +++ b/src/main/java/com/soft/line/controller/LoginController.java @@ -1,14 +1,14 @@ package com.soft.line.controller; -import com.soft.line.entity.UserInfo; + import com.soft.line.service.LoginService; -import com.soft.line.service.UserInfoService; +import com.soft.line.util.exception.CommonResult; import com.soft.line.util.exception.ResultData; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletRequest; +import java.util.HashMap; import java.util.Map; /** @@ -17,7 +17,7 @@ import java.util.Map; */ @Slf4j @RestController -@RequestMapping("/user") +@RequestMapping("/auth") public class LoginController { @Autowired @@ -25,7 +25,12 @@ public class LoginController { @PostMapping("/login") - public ResultData registerUserInfo(@RequestBody Map map){ + public ResultData loginUserInfo(@RequestBody Map map){ return loginService.userLogin(map); } + + @PostMapping("/loginout") + public ResultData exitUser(){ + return loginService.loginOut(); + } } diff --git a/src/main/java/com/soft/line/filter/HttpRequestUtil.java b/src/main/java/com/soft/line/filter/HttpRequestUtil.java index 2dd2ddf..e2a57f2 100644 --- a/src/main/java/com/soft/line/filter/HttpRequestUtil.java +++ b/src/main/java/com/soft/line/filter/HttpRequestUtil.java @@ -17,17 +17,16 @@ public class HttpRequestUtil { public static final RedisClient REDIS_SERVICE = (RedisClient) GlobalApplicationContextHolder.getApplicationContext() .getBean("redisClient"); - public static final String key = "SOFTLINE-BUILD"; - - public static final Integer expire = 3000*3; + // 过期时间设置为 15 min + public static final Integer expire = 60*15; public static UserTokenDto getUserToken() { final RequestAttributes ra = RequestContextHolder.getRequestAttributes(); final ServletRequestAttributes sra = (ServletRequestAttributes) ra; final HttpServletRequest request = sra.getRequest(); - HttpSession session=request.getSession(); + //HttpSession session=request.getSession(); final Map map = getHeadersInfo(request); String token = map.get("access-token"); if (token == null || "".equals(token)) { diff --git a/src/main/java/com/soft/line/service/LoginService.java b/src/main/java/com/soft/line/service/LoginService.java index 36b7cf4..d6b1a69 100644 --- a/src/main/java/com/soft/line/service/LoginService.java +++ b/src/main/java/com/soft/line/service/LoginService.java @@ -13,4 +13,6 @@ public interface LoginService { public ResultData userLogin(Map map); + public ResultData loginOut(); + } diff --git a/src/main/java/com/soft/line/service/impl/LoginServiceImpl.java b/src/main/java/com/soft/line/service/impl/LoginServiceImpl.java index 6b95897..6379837 100644 --- a/src/main/java/com/soft/line/service/impl/LoginServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/LoginServiceImpl.java @@ -19,6 +19,8 @@ import java.util.HashMap; import java.util.Map; import java.util.UUID; +import static com.soft.line.filter.HttpRequestUtil.REDIS_SERVICE; + /** * @author wu.xueqiao on 2020/5/12. * @version 0.1 @@ -50,10 +52,23 @@ public class LoginServiceImpl implements LoginService { } } + @Override + public ResultData loginOut() { + UserTokenDto userTokenDto=HttpRequestUtil.getUserToken(); + String key=userTokenDto.getUserName(); + boolean out=REDIS_SERVICE.del(key); + if(out){ + return new ResultData("200","退出登录成功！",null); + }else { + return new ResultData("500","退出登录失败！",null); + } + + } + public String returnToken(final UserTokenDto user) { if (redisClient.getKeyValue(user.getUserName()) == null || "".equals(redisClient.getKeyValue(user.getUserName()))) { - final Map claims = new HashMap(); + final Map claims = new HashMap<>(); claims.put("password", user.getPassword()); claims.put("username", user.getUserName()); claims.put("uuid", UUID.randomUUID().toString()); diff --git a/src/main/java/com/soft/line/service/impl/UserInfoServiceImpl.java b/src/main/java/com/soft/line/service/impl/UserInfoServiceImpl.java index 844064c..02c08ab 100644 --- a/src/main/java/com/soft/line/service/impl/UserInfoServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/UserInfoServiceImpl.java @@ -3,6 +3,8 @@ package com.soft.line.service.impl; import com.github.pagehelper.PageInfo; import com.soft.line.entity.UserInfo; +import com.soft.line.filter.HttpRequestUtil; +import com.soft.line.filter.UserTokenDto; import com.soft.line.mapper.UserInfoMapper; import com.soft.line.service.UserInfoService; import com.soft.line.util.pagehelper.PageUtil; @@ -49,6 +51,8 @@ public class UserInfoServiceImpl implements UserInfoService { @Override public int addUser(UserInfo userInfo) { + UserTokenDto userTokenDto= HttpRequestUtil.getUserToken(); + userInfo.setModifyPerson(userTokenDto.getUserName()); if (userInfo.getId()==null){ return userInfoMapper.insert(userInfo); }else { diff --git a/src/main/java/com/soft/line/util/generator/mybatis-generator.xml b/src/main/java/com/soft/line/util/generator/mybatis-generator.xml index a8de097..529a974 100644 --- a/src/main/java/com/soft/line/util/generator/mybatis-generator.xml +++ b/src/main/java/com/soft/line/util/generator/mybatis-generator.xml @@ -77,7 +77,7 @@ delimitAllColumns="true"> --> - Date: Mon, 25 May 2020 17:12:15 +0800 Subject: [PATCH 039/211] =?UTF-8?q?api=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/api/Api doc.md | 1294 +++++++++++++++++++++++++++++ 1 file changed, 1294 insertions(+) create mode 100644 src/main/resources/api/Api doc.md diff --git a/src/main/resources/api/Api doc.md b/src/main/resources/api/Api doc.md new file mode 100644 index 0000000..06ad7dc --- /dev/null +++ b/src/main/resources/api/Api doc.md @@ -0,0 +1,1294 @@ +# Api doc + +## 通用说明 + +* 接口通用前缀 + + > http://192.168.0.168:8081/softline + > + > + +* 请求头部 + + >Access-Token: 4291d7da9005377ec9aec4a71ea837f + > + >content-Type: application/json + +* 返回体 + + ```javascript + { + 'message': '', + 'timestamp': 0, + 'result': [], //返回数据 + 'code': 200 // 200 500 401 .. + }， + { + 'message': '', + 'timestamp': 0, + 'result': { + 'list': [{ Object }], + 'pageSize': 10, // 页面大小 + 'pageNum': 0, // 当前页 + 'pages': 1, // 总页数 + 'total': 2 // 数据总数 + }, + 'code': 200 + } + ``` + +* 错误码 + + | 错误代码 | 返回msg | + | :------: | :------------: | + | 400 | 请求参数有误 | + | 401 | 用户未登录 | + | 404 | 资源未找到 | + | 405 | 请求方式不支持 | + | 500 | 服务器错误 | + +## 1.通用接口 （common） + +### 1.1 枚举值 + +* 说明 + + 获取枚举值codeDetail + +* URL + + >`GET` + > + >[/codeDetail/{codeType}](/codeDetail/{codeType}) + +* path参数 + +| 参数名 | 必填 | 说明 | +| :------- | ---- | ---- | +| codeType | yes | | + +* 返回结果（data） + +``` javascript +[{ + codeType: 1, + codeDetail: 1, + codeContent1: '金融科技与服务事业部', + codeContent2: '', + codeContent3: '', + codeContent4: '', + note: '' +}, { + codeType: 1, + codeDetail: 2, + codeContent1: '国资与企业管控', + codeContent2: '', + codeContent3: '', + codeContent4: '', + note: '' +}...] +``` + +### 1.2 按钮列表 + + * 说明 + + 获取所有按钮列表 + +* URL + + > `get` + > + > [/buttons](/button) + +* 无参数 + +* 返回结果(data) + +```javascript +[{ + id: 1, + buttonName: '查询', + buttonType: 'query' +}, { + id: 2, + buttonName: '新增', + buttonType: 'add' +}, { + id: 3, + buttonName: '修改', + buttonType: 'edit' +}, { + id: 4, + buttonName: '删除', + buttonType: 'delete' +} + ... +] +``` + + +### 1.3 获取所有有操作按钮的页面 + +* 说明 + + 获取所有有操作按钮的页面(子菜单)，用于角色管理页面，供角色选择权限 + +* URL + + > `GET` + > + > [/pageMenu](pageMenu) + +* 无参数 + +* 返回结果（data） + +``` javascript +[ + { + id: '1', + menuName: '用户管理', + buttonList: [{ buttonName: '新增', buttonType: 'add' }, { buttonName: '查询', buttonType: 'query' }, + { buttonName: '删除', buttonType: 'delete' }, { buttonName: '编辑', buttonType: 'edit' }, + { buttonName: '修改密码', buttonType: 'changePassword' }] + }, { + id: '2', + menuName: '角色管理', + buttonList: [{ buttonName: '新增', buttonType: 'add' }, { buttonName: '查询', buttonType: 'query' }, + { buttonName: '删除', buttonType: 'delete' }, { buttonName: '编辑', buttonType: 'edit' }] + }, { + id: '3', + menuName: '菜单管理', + buttonList: [{ buttonName: '新增', buttonType: 'add' }, { buttonName: '查询', buttonType: 'query' }, + { buttonName: '删除', buttonType: 'delete' }, { buttonName: '编辑', buttonType: 'edit' }] + } +] +``` + +### 1.4 获取所有顶级菜单 + +* 说明 + + 获取所有顶级菜单，在菜单管理页面下拉框展示 + +* URL + + > `GET` + > + > [/topMenu](/topMenu) + +* 无参数 + +* 返回结果（data） + +```javascript +[{ + id: '1', + menuName: '系统管理' +},{ + id: '5', + menuName: '数据管理' +},{ + id: '8', + menuName: '统计管理' +}] +``` + +### 1.5 获取所有角色名 + +* 说明 + + 获取所有角色名，在用户管理页面，下拉框选择角色 + +* URL + + >`GET` + > + >[/roleNames](/roleNames) + +* 无参数 + +* 返回结果（data） + +```javascript +[ + { + id: '1', + roleName: '管理员' + }, { + id: '2', + roleName: '普通用户' + }, { + id: '3', + roleName: '其他' + } +] +``` + +## 2 用户接口 （auth） + +### 2.1 用户登录 + +* 说明 + + 登录系统，颁发token + +* URL + + > `POST` + > + > [/auth/login](/auth/login) + +* body参数 + +| 参数名 | 必填 | 说明 | +| -------- | ---- | ---- | +| userName | yes | | +| password | yes | | + +* 返回结果(data) + +``` javascript +{ + 'message': '登录成功', + 'timestamp': 0, + 'data': { + 'token': '4291d7da9005377ec9aec4a71ea837f', + 'roleId': '1' + } + 'code': 200 +} +``` + +### 2.2 用户登出 + +* 说明 + + 用户退出系统，注销token + +* URL + + >`POST` + > + >[/auth/logout](/auth/logout) + +* 无参数 + +* 返回结果 + +``` javascript + +``` + +### 2.3 获取用户的权限列表 + +* 说明 + + 获取用户角色对应的权限列表，形成前端路由 + +* URL + + > `GET` + > + > [/auth/userInfo](/auth/userInfo) + +* 无参数 + +* 返回结果 + +```javascript + +``` + +## 3 用户管理接口 （systemAdmin） + +### 3.1 获取所有用户列表 + +* 说明 + + 获取所有用户列表 + +* URL + + >`GET` + > + >[/accounts](/accounts) + +* body参数 + +| 参数名 | 必填 | 说明 | +| -------- | ---- | ---- | +| userName | no | | +| roleId | no | | +| status | no | | +| pageNum | yes | | +| pageSize | yes | | + +* 返回结果（list） + +``` javascript +[{ + id: 1, + userName: 'admin', + status: 1, + phone: 13312345678, + modifyTime: 1497160610259, + avatar: '', + roleId: 1 +}, { + id: 2, + userName: '迪迦', + status: 2, + phone: 13312345678, + modifyTime: 1497160610259, + avatar: '', + roleId: 2 +}, { + id: 3, + userName: '海泽王', + status: 2, + phone: 13312345678, + modifyTime: 1497160610259, + avatar: '', + roleId: 2 +}] +``` + +### 3.2 新增用户 + +* 说明 + + 新增用户 + +* URL + + > `POST` + > + > [/accounts](/accounts) + +* body参数 + +| 参数名 | 必填 | 说明 | +| ---------- | ---- | ------------ | +| userName | yes | | +| password | yes | | +| phone | yes | | +| roleId | yes | | +| userStatus | yes | | +| avatar | no | 系统默认生成 | + +* 返回结果 + +``` javascript +{ + 'message': '保存成功', + 'timestamp': 0, + 'data': null, + 'code': 200 +} +``` + +### 3.3 修改用户 + +* 说明 + + 修改用户 + +* URL + + > `PUT` + > + > [/accounts](/accounts) + +* body参数 + +| 参数名 | 必填 | 说明 | +| ---------- | ---- | ------ | +| id | yes | 用户id | +| userName | yes | | +| phone | yes | | +| roleId | yes | | +| userStatus | yes | | +| avatar | no | | + +* 返回结果 + +``` javascript +{ + 'message': '保存成功', + 'timestamp': 0, + 'data': null, + 'code': 200 +} +``` + +### 3.4 删除用户 + +* 说明 + + 删除用户 + +* URL + + >`DELETE` + > + >[/accounts](/accounts) + +* body参数 + +| 参数名 | 必填 | 说明 | +| ------ | ---- | ------ | +| id | 必填 | 用户Id | + +* 返回结果 + +``` javascript +{ + 'message': '删除成功', + 'timestamp': 0, + 'data': null, + 'code': 200 +} +``` + +### 3.5 修改密码 + +* 说明 + + 修改密码 + +* URL + + > `POST` + > + > [/changePassword](/changePassword) + +* body参数 + +| 参数名 | 必填 | 说明 | +| -------------- | ---- | ------------ | +| id | 必填 | 修改用户的id | +| oldPassword | 必填 | 老密码 | +| newPassword | 必填 | 新密码 | +| confimPassword | 必填 | 确认密码 | + +* 返回结果 + +``` javascript +{ + 'message': '修改成功', + 'timestamp': 0, + 'data': null, + 'code': 200 +} +``` + +## 4 角色管理接口 (systemAdmin) + +### 4.1 获取所有角色列表 + +* 说明 + + 获取所有角色列表，包含该角色对应的菜单按钮 + +* URL + + > `GET` + > + > [/roles](/roles) + +* body参数 + +| 参数名 | 必填 | 说明 | +| -------- | ---- | ---- | +| roleName | no | | +| pageNum | yes | | +| pageSize | yes | | + +* 返回结果（list） + +``` javascript +[{ + 'id': '1', + 'roleName': '管理员', + 'status': 1, + 'describe': '管理员权限', + 'menuList': [{ + 'menuId': '1', + 'menuName': '用户管理', + 'buttonList': ['query', 'delete', 'edit', 'add', 'changePassword'] + }, { + 'menuId': '2', + 'menuName': '角色管理', + 'buttonList': ['query', 'delete', 'edit', 'add'] + }, { + 'menuId': '3', + 'menuName': '菜单管理', + 'buttonList': ['query', 'delete', 'edit', 'add'] + }, { + 'menuId': '4', + 'menuName': '合同管理', + 'buttonList': ['query', 'delete', 'edit', 'add', 'import', 'export'] + }, { + 'menuId': '5', + 'menuName': '证书管理', + 'buttonList': ['query', 'delete', 'edit', 'add', 'import'] + }] +}] +``` + +### 4.2 新增角色 ? + +* 说明 + + 新增角色 + +* URL + + > `POST` + > + > [/roles](/roles) + +* body参数 + +| 参数名 | 必填 | 说明 | +| -------- | ---- | ---- | +| roleName | yes | | +| describe | no | | +| menu | yes | | + +* 参数举例 + +``` javascript +{ + 'roleName': '管理员' + 'describe': '描述字段' + 'menu': [{ + 'menuId': '1', + 'buttonList': ['query', 'edit', 'add'] + }, { + 'menuId': '2', + 'buttonList': ['add', 'edit'] + }...] +} +``` + +* 返回结果 + +``` javascript +{ + 'message': '保存成功', + 'timestamp': 0, + 'data': null, + 'code': 200 +} +``` + +### 4.3 修改角色 ? + +* 说明 + + 修改角色 + +* URL + + > `PUT` + > + > [/roles](/roles) + +* body参数 + +| 参数名 | 必填 | 说明 | +| -------- | ---- | ------ | +| id | yes | 角色Id | +| roleName | yes | | +| describe | no | | +| menu | yes | | + +* 参数举例 + +``` javascript +{ + 'id': 1 + 'roleName': '管理员' + 'describe': '描述字段' + 'menu': [{ + 'menuId': '1', + 'buttonList': ['query', 'edit', 'add'] + }, { + 'menuId': '2', + 'buttonList': ['add', 'edit'] + }...] +} +``` + +* 返回结果 + +``` javascript +{ + 'message': '保存成功', + 'timestamp': 0, + 'data': null, + 'code': 200 +} +``` + +### 4.4 删除角色 + +* 说明 + + 删除角色 + +* URL + + >`DELETE` + > + >[/roles](/roles) + +* body参数 + +| 参数名 | 必填 | 说明 | +| ------ | ---- | ------ | +| id | 必填 | roleId | + +* 返回结果 + +``` javascript +{ + 'message': '删除成功', + 'timestamp': 0, + 'data': null, + 'code': 200 +} +``` + +## 5 菜单管理接口 （systemAdmin） + +### 5.1 获取所有菜单列表 + +* 说明 + + 获取所有菜单列表，包含该角色对应的按钮列表 + +* URL + + > `GET` + > + > [/menu](/menu) + +* body参数 + +| 参数名 | 必填 | 说明 | +| -------- | ---- | ---- | +| menuName | no | | +| menuUrl | no | | +| pageNum | yes | | +| pageSize | yes | | + +* 返回结果（list） + +``` javascript +[ + { + id: '1', + menuName: '系统管理', + menuIcon: 'setting', + state: '1', + menuUrl: '/systemAdmin', + orderBy: '1', + pId: '-1', + modifyTime: '202005211526', + buttonList: [] + }, + { + id: '2', + menuName: '用户管理', + menuIcon: 'setting', + state: '2', + menuUrl: '/systemAdmin/account', + orderBy: '1', + pId: '1', + modifyTime: '202005211526', + buttonList: [{ + buttonName: '新增', buttonType: 'add' + }, { + buttonName: '查询', buttonType: 'query' + }, { + buttonName: '删除', buttonType: 'delete' + }, { + buttonName: '编辑', buttonType: 'edit' + }] + }... +] +``` + +### 5.2 新增菜单 + +* 说明 + + 新增菜单 + +* URL + + > `POST` + > + > [/menus](/menus) + +* body参数 + +| 参数名 | 必填 | 说明 | +| ---------- | ---- | ------------------ | +| menuName | yes | | +| menuUrl | yes | | +| menuIcon | yes | | +| pId | yes | 顶级菜单-1 | +| buttonList | no | 顶级菜单没有button | + +* 参数举例 + +``` javascript +{ + menuName: '用户管理' + menuUrl: '/accounts' + menuIcon: 'setting' + pId: '1' + buttonList: ['add', 'edit', 'query'] +} +``` + +* 返回结果 + +``` javascript +{ + 'message': '保存成功', + 'timestamp': 0, + 'data': null, + 'code': 200 +} +``` + +### 5.3 修改菜单 + +* 说明 + + 修改菜单 + +* URL + + > `PUT` + > + > [/menus](/menus) + +* body参数 + +| 参数名 | 必填 | 说明 | +| ---------- | ---- | ------------------ | +| id | yes | 菜单id | +| menuName | yes | | +| menuUrl | yes | | +| menuIcon | yes | | +| pId | yes | | +| buttonList | no | 顶级菜单没有button | + +* 参数举例 + +``` javascript +{ + 'id': 1 + 'roleName': '管理员' + 'describe': '描述字段' + 'menu': [{ + 'menuId': '1', + 'buttonList': ['query', 'edit', 'add'] + }, { + 'menuId': '2', + 'buttonList': ['add', 'edit'] + }...] +} +``` + +* 返回结果 + +``` javascript +{ + 'message': '保存成功', + 'timestamp': 0, + 'data': null, + 'code': 200 +} +``` + +### 5.4 删除菜单 + +* 说明 + + 删除菜单 + +* URL + + >`DELETE` + > + >[/menus](/menus) + +* body参数 + +| 参数名 | 必填 | 说明 | +| ------ | ---- | ------ | +| id | 必填 | 菜单ID | + +* 返回结果 + +``` javascript +{ + 'message': '删除成功', + 'timestamp': 0, + 'data': null, + 'code': 200 +} +``` + +## 6 合同管理接口 （dataManage） + +### 6.1 获取所有合同 + +* 说明 + + 获取所有合同 + +* URL + + > `GET` + > + > [/contract](/contract) + +* body参数 + +| 参数名 | 必填 | 说明 | +| ------------ | ---- | ------------ | +| depId | no | 部门id | +| contractName | no | | +| proId | no | 项目id | +| totalAmount | no | 大于这个金额 | +| partA | no | | +| partB | no | | +| signTime | no | | +| signAddr | no | | +| beginDate | no | | +| endDate | no | | +| payment | no | | +| pageNum | yes | | +| pageSize | yes | | + +* 返回结果（list） + +``` javascript +[{ + id: 1, + depId: 1, + contractName: '合同1', + proId: 1, + totalAmount: '10000000', + partA: 'A', + partB: 'B', + signTime: '20200521', + signAddr: 'SH', + beginDate: '20200521', + endDate: '20250521', + payment: 'cash', + note: 'xxxx', + modifyTime: '20200521223000', + modifyPerson: 'admin' +}] +``` + +### 6.2 新增合同 + +* 说明 + + 新增合同 + +* URL + + > `POST` + > + > [/contract](/contract) + +* body参数 + +| 参数名 | 必填 | 说明 | +| ------------ | ---- | ------------ | +| depId | yes | 部门id | +| contractName | yes | | +| proId | yes | 项目id | +| totalAmount | yes | 大于这个金额 | +| partA | yes | | +| partB | yes | | +| signTime | yes | | +| signAddr | yes | | +| beginDate | yes | | +| endDate | yes | | +| payment | yes | | +| note | no | | + +* 参数举例 + +``` javascript +{ + beginDate: "20200501" + contractName: "请问" + depId: 1 + endDate: "20200610" + note: "请问" + partA: "请问" + partB: " 请问" + payment: 1 + proId: 1 + signAddr: "请问" + signTime: "20200519" + totalAmount: " 请问" +} +``` + +* 返回结果 + +``` javascript +{ + 'message': '保存成功', + 'timestamp': 0, + 'data': null, + 'code': 200 +} +``` + +### 6.3 修改合同 + +* 说明 + + 修改合同 + +* URL + + > `PUT` + > + > [/contract](/contract) + +* body参数 + +| 参数名 | 必填 | 说明 | +| ------------ | ---- | ------------ | +| depId | yes | 部门id | +| contractName | yes | | +| proId | yes | 项目id | +| totalAmount | yes | 大于这个金额 | +| partA | yes | | +| partB | yes | | +| signTime | yes | | +| signAddr | yes | | +| beginDate | yes | | +| endDate | yes | | +| payment | yes | | +| note | no | | + +* 参数举例 + +``` javascript +{ + id: 1 + beginDate: "20200501" + contractName: "请问" + depId: 1 + endDate: "20200610" + note: "请问" + partA: "请问" + partB: " 请问" + payment: 1 + proId: 1 + signAddr: "请问" + signTime: "20200519" + totalAmount: " 请问" +} +``` + +* 返回结果 + +``` javascript +{ + 'message': '保存成功', + 'timestamp': 0, + 'data': null, + 'code': 200 +} +``` + +### 6.4 删除合同 + +* 说明 + + 删除合同 + +* URL + + >`DELETE` + > + >[/contract](/contract) + +* body参数 + +| 参数名 | 必填 | 说明 | +| ------ | ---- | ------ | +| id | 必填 | 合同id | + +* 返回结果 + +``` javascript +{ + 'message': '删除成功', + 'timestamp': 0, + 'data': null, + 'code': 200 +} +``` + +## 7 证书管理接口 （dataManage） + +### 5.1 获取所有菜单列表 + +* 说明 + + 获取所有菜单列表，包含该角色对应的按钮列表 + +* URL + + > `GET` + > + > [/menu](/menu) + +* body参数 + +| 参数名 | 必填 | 说明 | +| -------- | ---- | ---- | +| menuName | no | | +| menuUrl | no | | +| pageNum | yes | | +| pageSize | yes | | + +* 返回结果（list） + +``` javascript +[ + { + id: '1', + menuName: '系统管理', + menuIcon: 'setting', + state: '1', + menuUrl: '/systemAdmin', + orderBy: '1', + pId: '-1', + modifyTime: '202005211526', + buttonList: [] + }, + { + id: '2', + menuName: '用户管理', + menuIcon: 'setting', + state: '2', + menuUrl: '/systemAdmin/account', + orderBy: '1', + pId: '1', + modifyTime: '202005211526', + buttonList: [{ + buttonName: '新增', buttonType: 'add' + }, { + buttonName: '查询', buttonType: 'query' + }, { + buttonName: '删除', buttonType: 'delete' + }, { + buttonName: '编辑', buttonType: 'edit' + }] + }... +] +``` + +### 4.2 新增菜单 + +* 说明 + + 新增菜单 + +* URL + + > `POST` + > + > [/menus](/menus) + +* body参数 + +| 参数名 | 必填 | 说明 | +| ---------- | ---- | ------------------ | +| menuName | yes | | +| menuUrl | yes | | +| menuIcon | yes | | +| pId | yes | 顶级菜单-1 | +| buttonList | no | 顶级菜单没有button | + +* 参数举例 + +``` javascript +{ + menuName: '用户管理' + menuUrl: '/accounts' + menuIcon: 'setting' + pId: '1' + buttonList: ['add', 'edit', 'query'] +} +``` + +* 返回结果 + +``` javascript +{ + 'message': '保存成功', + 'timestamp': 0, + 'data': null, + 'code': 200 +} +``` + +### 4.3 修改菜单 + +* 说明 + + 修改菜单 + +* URL + + > `PUT` + > + > [/menus](/menus) + +* body参数 + +| 参数名 | 必填 | 说明 | +| ---------- | ---- | ------------------ | +| id | yes | 菜单id | +| menuName | yes | | +| menuUrl | yes | | +| menuIcon | yes | | +| pId | yes | | +| buttonList | no | 顶级菜单没有button | + +* 参数举例 + +``` javascript +{ + 'id': 1 + 'roleName': '管理员' + 'describe': '描述字段' + 'menu': [{ + 'menuId': '1', + 'buttonList': ['query', 'edit', 'add'] + }, { + 'menuId': '2', + 'buttonList': ['add', 'edit'] + }...] +} +``` + +* 返回结果 + +``` javascript +{ + 'message': '保存成功', + 'timestamp': 0, + 'data': null, + 'code': 200 +} +``` + +### 4.4 删除菜单 + +* 说明 + + 删除菜单 + +* URL + + >`DELETE` + > + >[/menus](/menus) + +* body参数 + +| 参数名 | 必填 | 说明 | +| ------ | ---- | ------ | +| id | 必填 | 菜单ID | + +* 返回结果 + +``` javascript +{ + 'message': '删除成功', + 'timestamp': 0, + 'data': null, + 'code': 200 +} +``` + +## 8 附件管理接口 (attachment) + +### 8.1 获取附件列表 + +* 说明 + + 获取合同或是证书的附件列表 + +* URL + + > `GET` + > + > [/attachment/{attachmentType}/{id}](/attachment/{attachmentType}/{id}) + +* path参数 + +| 参数名 | 必填 | 说明 | +| -------------- | ---- | ------------------------ | +| attachmentType | yes | 合同附件：1，证书附件：2 | +| id | yes | 合同id，或是证书id | + +* 返回结果（result） + +``` javascript +[{ + id: '1', + attachmentName: '附件1.doc', + attachmentUrl: 'blob:http://149.25.11.1/qweasdczxc156qwead.doc' +}, { + id: '2', + attachmentName: '附件2.doc', + attachmentUrl: 'blob:http://149.25.11.1/qweasdczxc156qwead.doc' +}, { + id: '3', + attachmentName: '附件3.doc', + attachmentUrl: 'blob:http://149.25.11.1/qweasdczxc156qwead.doc' +}] +``` + +### 8.2 上传附件 + +* 说明 + + 上传附件 + +* URL + + > `POST` + > + > [/upload](/upload) + +* body参数 + +|参数名|必填|说明| +|||| +|| + -- Gitee From 0e55313950d0fef60e7eb2ade7a93aed0c715e5b Mon Sep 17 00:00:00 2001 From: ljc <1119265069@qq.com> Date: Tue, 26 May 2020 00:01:56 +0800 Subject: [PATCH 040/211] menuinfo orderby --- .../soft/line/controller/MenuController.java | 118 +++++++++---- .../com/soft/line/entity/AttachementInfo.java | 165 ------------------ .../line/mapper/AttachementInfoMapper.java | 30 ---- .../line/mapper/AttachementInfoMapper.xml | 42 ----- .../soft/line/mapper/ButtonInfoMapper.java | 3 + .../com/soft/line/mapper/ButtonInfoMapper.xml | 6 + .../soft/line/mapper/MenuButtonInfoMapper.xml | 38 ---- .../com/soft/line/mapper/MenuInfoMapper.java | 14 +- .../com/soft/line/mapper/MenuInfoMapper.xml | 23 ++- .../soft/line/service/ButtonInfoService.java | 2 + .../soft/line/service/MenuInfoService.java | 8 +- .../service/impl/ButtonInfoServiceImpl.java | 5 + .../service/impl/MenuInfoServiceImpl.java | 17 +- .../line/util/exception/CommonResult.java | 2 +- .../soft/line/util/exception/ResultData.java | 14 +- 15 files changed, 142 insertions(+), 345 deletions(-) delete mode 100644 src/main/java/com/soft/line/entity/AttachementInfo.java delete mode 100644 src/main/java/com/soft/line/mapper/AttachementInfoMapper.java delete mode 100644 src/main/java/com/soft/line/mapper/AttachementInfoMapper.xml diff --git a/src/main/java/com/soft/line/controller/MenuController.java b/src/main/java/com/soft/line/controller/MenuController.java index 0d4caf7..70e02c3 100644 --- a/src/main/java/com/soft/line/controller/MenuController.java +++ b/src/main/java/com/soft/line/controller/MenuController.java @@ -4,6 +4,7 @@ import com.github.pagehelper.PageInfo; import com.soft.line.entity.ButtonInfo; import com.soft.line.entity.MenuButtonInfo; import com.soft.line.entity.MenuInfo; +import com.soft.line.service.ButtonInfoService; import com.soft.line.service.CodeDetailService; import com.soft.line.service.MenuInfoService; import com.soft.line.util.exception.CommonResult; @@ -21,20 +22,21 @@ import java.util.*; @Api(value = "菜单接口") @Slf4j @RestController +@RequestMapping("/systemAdmin") public class MenuController { @Autowired private MenuInfoService menuInfoService; @Autowired - private CodeDetailService codeDetailService; + private ButtonInfoService buttonInfoService; - @GetMapping("/systemAdmin/menus") + @GetMapping("/menus") @ApiOperation(value = "查询所有菜单列表") public CommonResult> getAllMenus(@RequestBody Map map) { return CommonResult.success(menuInfoService.selectAll(map)); } - @GetMapping("/systemAdmin/selectALlMenuName") + @GetMapping("/selectALlMenuName") @ApiOperation(value = "查询所有菜单名称") public CommonResult> getAllMenuNames() { return CommonResult.success(menuInfoService.selectALlMenuName()); @@ -44,75 +46,117 @@ public class MenuController { @ApiImplicitParams({ @ApiImplicitParam(name = "menuId", value = "菜单ID", required = true, dataType = "Integer", paramType = "path") }) - @GetMapping("systemAdmin/getMenu") + @GetMapping("/getMenu") public CommonResult getMenuInfoByID(@RequestBody Map map) { Integer id = (Integer) map.get("id"); return CommonResult.success(menuInfoService.selectByPrimaryKey(id)); } @ApiOperation(value = "删除菜单") - @PostMapping("systemAdmin/deleteMenu") + @DeleteMapping("/menus") public ResultData deleteMenu(@RequestBody Map map){ - Integer menuId = (Integer) map.get("id"); + menuInfoService.delete((Integer) map.get("id")); return new ResultData("200","删除成功",null); } - @ApiOperation(value = "保存菜单") - @PostMapping("systemAdmin/menus/saveMenu") - public ResultData saveMenu(@RequestBody Map map) { + @ApiOperation(value = "添加菜单") + @PostMapping("/menus") + public ResultData addMenu(@RequestBody Map map) { MenuInfo menuInfo = new MenuInfo(); - if (map.get("id")!=null&&!map.get("id").toString().equals("")){ - menuInfo.setId((Integer) map.get("id")); - } if (map.get("menuName")==null){ - return new ResultData("500","菜单名称不能为空",null); + return new ResultData("200","菜单名称不能为空",null); }else{ + //新增时判断menuName是否重复 menuInfo.setMenuName(map.get("menuName").toString()); + if (menuInfoService.countMenuName(menuInfo.getId(),menuInfo.getMenuName())>0){ + return new ResultData("200","菜单名称已存在",null); + } } - //新增时判断menuName是否重复 - if (menuInfo.getId()==null&&menuInfo.getMenuName()!=null){ - int i=menuInfoService.countMenuName(menuInfo.getMenuName()); - if (i>0){ - return new ResultData("500","菜单名称已存在",null); + menuInfo.setMenuIcon(map.get("menuIcon")==null?"":map.get("menuIcon").toString()); + menuInfo.setMenuUrl(map.get("menuUrl")==null?"":map.get("menuUrl").toString()); + if (map.get("orderby")==null){ + return new ResultData("200","菜单排序不能为空",null); + }else{ + menuInfo.setOrderby(map.get("orderby")==null?"":map.get("orderby").toString()); + if (menuInfoService.countOrderBy(menuInfo.getId(),menuInfo.getOrderby())>0){ + return new ResultData("200","菜单排序已存在",null); + } + } + + //判断父级菜单是否存在 + menuInfo.setpId((Integer) map.get("pId")); + if (menuInfo.getpId()==-1){ + menuInfo.setState(1); + }else { + MenuInfo pMenu = menuInfoService.selectParentMenu(menuInfo.getpId()); + if (pMenu==null){ + return new ResultData("200","父级菜单不存在",null); + } + menuInfo.setState(pMenu.getState()+1); + } + + menuInfo.setModifyTime(new Date()); + menuInfo.setModifyPerson("admin"); + List buttonInfos =new ArrayList(); + for (String buttonName : (List)map.get("buttonList")){ + ButtonInfo buttonInfo = buttonInfoService.selectByButtonName(buttonName); + buttonInfos.add(buttonInfo); + } + menuInfo.setButtonInfoList(buttonInfos); + menuInfoService.addMenuInfo(menuInfo); + return new ResultData("200","添加菜单成功",null); + + } + + @ApiOperation(value = "修改菜单") + @PutMapping("/menus") + public ResultData editMenu(@RequestBody Map map) { + MenuInfo menuInfo = new MenuInfo(); + menuInfo.setId((Integer) map.get("id")); + if (map.get("menuName")==null){ + return new ResultData("200","菜单名称不能为空",null); + }else{ + //新增时判断menuName是否重复 + menuInfo.setMenuName(map.get("menuName").toString()); + if (menuInfoService.countMenuName(menuInfo.getId(),menuInfo.getMenuName())>0){ + return new ResultData("200","菜单名称已存在",null); } } menuInfo.setMenuIcon(map.get("menuIcon")==null?"":map.get("menuIcon").toString()); menuInfo.setMenuUrl(map.get("menuUrl")==null?"":map.get("menuUrl").toString()); - menuInfo.setOrderby(map.get("orderby")==null?"":map.get("orderby").toString()); + if (map.get("orderby")==null){ + return new ResultData("200","菜单排序不能为空",null); + }else{ + menuInfo.setOrderby(map.get("orderby")==null?"":map.get("orderby").toString()); + if (menuInfoService.countOrderBy(menuInfo.getId(),menuInfo.getOrderby())>0){ + return new ResultData("200","菜单排序已存在",null); + } + } + //判断父级菜单是否存在 - if (map.get("pName")==null||map.get("pName").toString().equals("")){ - menuInfo.setpId(-1); + menuInfo.setpId((Integer) map.get("pId")); + if (menuInfo.getpId()==-1){ menuInfo.setState(1); }else { - MenuInfo pMenu = menuInfoService.selectAllByMenuName(map.get("pName").toString()); + MenuInfo pMenu = menuInfoService.selectParentMenu(menuInfo.getpId()); if (pMenu==null){ - return new ResultData("500","父级菜单不存在",null); + return new ResultData("200","父级菜单不存在",null); } - menuInfo.setpId(pMenu.getpId()); menuInfo.setState(pMenu.getState()+1); } - menuInfo.setModifyTime(new Date()); menuInfo.setModifyPerson("admin"); List buttonInfos =new ArrayList(); - for (Map buttonMap : (List>)map.get("buttonInfoList")){ - ButtonInfo buttonInfo = new ButtonInfo(); - buttonInfo.setButtonId(buttonMap.get("buttonId").toString()); - buttonInfo.setButtonName(buttonMap.get("buttonName").toString()); - buttonInfo.setButtonType(buttonMap.get("buttonType").toString()); + for (String buttonName : (List)map.get("buttonList")){ + ButtonInfo buttonInfo = buttonInfoService.selectByButtonName(buttonName); buttonInfos.add(buttonInfo); } - if (menuInfo.getId()!=null){ - menuInfoService.addMenuInfo(menuInfo); - return new ResultData("200","更新成功",null); - }else{ + menuInfoService.updateMenInfo(menuInfo); - return new ResultData("200","添加成功",null); - } + return new ResultData("200","修改菜单成功",null); } - } diff --git a/src/main/java/com/soft/line/entity/AttachementInfo.java b/src/main/java/com/soft/line/entity/AttachementInfo.java deleted file mode 100644 index f2dc331..0000000 --- a/src/main/java/com/soft/line/entity/AttachementInfo.java +++ /dev/null @@ -1,165 +0,0 @@ -package com.soft.line.entity; - -import java.util.Date; - -public class AttachementInfo { - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column attachement_info.id - * - * @mbggenerated - */ - private Integer id; - - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column attachement_info.attachment_name - * - * @mbggenerated - */ - private String attachmentName; - - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column attachement_info.attachement_url - * - * @mbggenerated - */ - private String attachementUrl; - - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column attachement_info.modify_person - * - * @mbggenerated - */ - private String modifyPerson; - - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column attachement_info.modify_time - * - * @mbggenerated - */ - private Date modifyTime; - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column attachement_info.id - * - * @return the value of attachement_info.id - * - * @mbggenerated - */ - public Integer getId() { - return id; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column attachement_info.id - * - * @param id the value for attachement_info.id - * - * @mbggenerated - */ - public void setId(Integer id) { - this.id = id; - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column attachement_info.attachment_name - * - * @return the value of attachement_info.attachment_name - * - * @mbggenerated - */ - public String getAttachmentName() { - return attachmentName; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column attachement_info.attachment_name - * - * @param attachmentName the value for attachement_info.attachment_name - * - * @mbggenerated - */ - public void setAttachmentName(String attachmentName) { - this.attachmentName = attachmentName == null ? null : attachmentName.trim(); - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column attachement_info.attachement_url - * - * @return the value of attachement_info.attachement_url - * - * @mbggenerated - */ - public String getAttachementUrl() { - return attachementUrl; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column attachement_info.attachement_url - * - * @param attachementUrl the value for attachement_info.attachement_url - * - * @mbggenerated - */ - public void setAttachementUrl(String attachementUrl) { - this.attachementUrl = attachementUrl == null ? null : attachementUrl.trim(); - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column attachement_info.modify_person - * - * @return the value of attachement_info.modify_person - * - * @mbggenerated - */ - public String getModifyPerson() { - return modifyPerson; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column attachement_info.modify_person - * - * @param modifyPerson the value for attachement_info.modify_person - * - * @mbggenerated - */ - public void setModifyPerson(String modifyPerson) { - this.modifyPerson = modifyPerson == null ? null : modifyPerson.trim(); - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column attachement_info.modify_time - * - * @return the value of attachement_info.modify_time - * - * @mbggenerated - */ - public Date getModifyTime() { - return modifyTime; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column attachement_info.modify_time - * - * @param modifyTime the value for attachement_info.modify_time - * - * @mbggenerated - */ - public void setModifyTime(Date modifyTime) { - this.modifyTime = modifyTime; - } -} \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/AttachementInfoMapper.java b/src/main/java/com/soft/line/mapper/AttachementInfoMapper.java deleted file mode 100644 index cd1d849..0000000 --- a/src/main/java/com/soft/line/mapper/AttachementInfoMapper.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.soft.line.mapper; - -import com.soft.line.entity.AttachementInfo; -import java.util.List; - -public interface AttachementInfoMapper { - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table attachement_info - * - * @mbggenerated - */ - int insert(AttachementInfo record); - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table attachement_info - * - * @mbggenerated - */ - AttachementInfo selectByPrimaryKey(Integer id); - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table attachement_info - * - * @mbggenerated - */ - List selectAll(); -} \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/AttachementInfoMapper.xml b/src/main/java/com/soft/line/mapper/AttachementInfoMapper.xml deleted file mode 100644 index 166b425..0000000 --- a/src/main/java/com/soft/line/mapper/AttachementInfoMapper.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - insert into `attachement_info` (`attachment_name`, `attachement_url`, `modify_person`, - `modify_time`) - values (#{attachmentName,jdbcType=VARCHAR}, #{attachementUrl,jdbcType=VARCHAR}, #{modifyPerson,jdbcType=VARCHAR}, - #{modifyTime,jdbcType=TIMESTAMP}) - - - - \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/ButtonInfoMapper.java b/src/main/java/com/soft/line/mapper/ButtonInfoMapper.java index 230461a..a0049af 100644 --- a/src/main/java/com/soft/line/mapper/ButtonInfoMapper.java +++ b/src/main/java/com/soft/line/mapper/ButtonInfoMapper.java @@ -2,15 +2,18 @@ package com.soft.line.mapper; import com.soft.line.entity.ButtonInfo; import com.soft.line.entity.CodeDetail; +import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import java.util.List; +@Mapper public interface ButtonInfoMapper { List selectAll(); List selectButtonsByMenuId(Integer menuId); + ButtonInfo selectByButtonName(String buttonName); } \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/ButtonInfoMapper.xml b/src/main/java/com/soft/line/mapper/ButtonInfoMapper.xml index 8375aa5..935d7fc 100644 --- a/src/main/java/com/soft/line/mapper/ButtonInfoMapper.xml +++ b/src/main/java/com/soft/line/mapper/ButtonInfoMapper.xml @@ -18,4 +18,10 @@ where `code_type` = '4' and mbi.button_id = cd.code_detail and mbi.menu_id = #{menuId,jdbcType=INTEGER} + + \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/MenuButtonInfoMapper.xml b/src/main/java/com/soft/line/mapper/MenuButtonInfoMapper.xml index 3529a77..f75c0d7 100644 --- a/src/main/java/com/soft/line/mapper/MenuButtonInfoMapper.xml +++ b/src/main/java/com/soft/line/mapper/MenuButtonInfoMapper.xml @@ -1,44 +1,6 @@ - - - - - - - - - - - insert into `menu_button_info` (`menu_id`, `button_id`, `modify_person`, - `modify_time`) - values (#{menuId,jdbcType=INTEGER}, #{buttonId,jdbcType=VARCHAR}, #{modifyPerson,jdbcType=VARCHAR}, - #{modifyTime,jdbcType=TIMESTAMP}) - - - diff --git a/src/main/java/com/soft/line/mapper/MenuInfoMapper.java b/src/main/java/com/soft/line/mapper/MenuInfoMapper.java index 7010a0c..c8da799 100644 --- a/src/main/java/com/soft/line/mapper/MenuInfoMapper.java +++ b/src/main/java/com/soft/line/mapper/MenuInfoMapper.java @@ -27,14 +27,10 @@ public interface MenuInfoMapper { int deleteRoleMenu(Integer menuId); - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table menu_info - * - * @mbggenerated - */ MenuInfo selectByPrimaryKey(Integer id); + MenuInfo selectParentMenu(Integer pid); + /** * This method was generated by MyBatis Generator. * This method corresponds to the database table menu_info @@ -43,13 +39,13 @@ public interface MenuInfoMapper { */ List selectAll(); - int countMenuName(String menuName); + int countMenuName(@Param("id") Integer id,@Param("menuName") String menuName); + + int countOrderBy(@Param("id") Integer id,@Param("orderBy") String orderBy); @Select("select menu_name from menu_info") List selectALlMenuName(); - @Select("select * from menu_info where menu_name = #{menuName}") - MenuInfo selectAllByMenuName(String menuName); } \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/MenuInfoMapper.xml b/src/main/java/com/soft/line/mapper/MenuInfoMapper.xml index 8fbdd28..6182f5e 100644 --- a/src/main/java/com/soft/line/mapper/MenuInfoMapper.xml +++ b/src/main/java/com/soft/line/mapper/MenuInfoMapper.xml @@ -38,13 +38,11 @@ - delete from menu_button_info where menu_id =(select from menu_info mi where mi.id=#{menuId}) + delete from menu_button_info where menu_id =(select mi.id from menu_info mi where mi.id=#{menuId}) - delete from role_menu - where menu_button_id = (select mbi.id from menu_button_info mbi - where mbi.menu_id =(select from menu_info mi where mi.id=#{menuId})) + delete from role_menu where menu_button_id = (select mbi.id from menu_button_info mbi where mbi.menu_id =(select mi.id from menu_info mi where mi.id=#{menuId})) - select count(*) from `menu_info` where menu_name = #{menuName} + + and id ]]> #{id} + + - select `id`, `menu_icon`, `menu_name`, `state`, `menu_url`, `orderby`, `p_id`, `modify_person`, `modify_time` - from menu_info where menu_name = #{menuName} + from menu_info where id = #{pid} \ No newline at end of file diff --git a/src/main/java/com/soft/line/service/ButtonInfoService.java b/src/main/java/com/soft/line/service/ButtonInfoService.java index 91955e9..32a82f1 100644 --- a/src/main/java/com/soft/line/service/ButtonInfoService.java +++ b/src/main/java/com/soft/line/service/ButtonInfoService.java @@ -11,4 +11,6 @@ import java.util.Map; public interface ButtonInfoService { public List selectAll(); + + public ButtonInfo selectByButtonName(String buttonName); } diff --git a/src/main/java/com/soft/line/service/MenuInfoService.java b/src/main/java/com/soft/line/service/MenuInfoService.java index 9251103..d373a3c 100644 --- a/src/main/java/com/soft/line/service/MenuInfoService.java +++ b/src/main/java/com/soft/line/service/MenuInfoService.java @@ -16,11 +16,13 @@ public interface MenuInfoService { public MenuInfo selectByPrimaryKey(Integer id); - public int countMenuName(String menuName); + public MenuInfo selectParentMenu(Integer pid); - public List selectALlMenuName(); + public int countMenuName(Integer id,String menuName); + + public int countOrderBy(Integer id,String orderBy); - public MenuInfo selectAllByMenuName(String menuMane); + public List selectALlMenuName(); public void addMenuInfo(MenuInfo menuInfo); diff --git a/src/main/java/com/soft/line/service/impl/ButtonInfoServiceImpl.java b/src/main/java/com/soft/line/service/impl/ButtonInfoServiceImpl.java index 10e14df..bc86ec4 100644 --- a/src/main/java/com/soft/line/service/impl/ButtonInfoServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/ButtonInfoServiceImpl.java @@ -20,4 +20,9 @@ public class ButtonInfoServiceImpl implements ButtonInfoService { public List selectAll() { return buttonInfoMapper.selectAll(); } + + @Override + public ButtonInfo selectByButtonName(String buttonName) { + return buttonInfoMapper.selectByButtonName(buttonName); + } } diff --git a/src/main/java/com/soft/line/service/impl/MenuInfoServiceImpl.java b/src/main/java/com/soft/line/service/impl/MenuInfoServiceImpl.java index f820ccf..84c7bf9 100644 --- a/src/main/java/com/soft/line/service/impl/MenuInfoServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/MenuInfoServiceImpl.java @@ -54,18 +54,23 @@ public class MenuInfoServiceImpl implements MenuInfoService { } @Override - public int countMenuName(String menuName) { - return menuInfoMapper.countMenuName(menuName); + public MenuInfo selectParentMenu(Integer pid) { + return menuInfoMapper.selectParentMenu(pid); } @Override - public List selectALlMenuName() { - return menuInfoMapper.selectALlMenuName(); + public int countMenuName(Integer id,String menuName) { + return menuInfoMapper.countMenuName(id,menuName); } @Override - public MenuInfo selectAllByMenuName(String menuMane) { - return menuInfoMapper.selectAllByMenuName(menuMane); + public int countOrderBy(Integer id,String orderBy) { + return menuInfoMapper.countOrderBy(id,orderBy); + } + + @Override + public List selectALlMenuName() { + return menuInfoMapper.selectALlMenuName(); } @Override diff --git a/src/main/java/com/soft/line/util/exception/CommonResult.java b/src/main/java/com/soft/line/util/exception/CommonResult.java index 62af127..4200b58 100644 --- a/src/main/java/com/soft/line/util/exception/CommonResult.java +++ b/src/main/java/com/soft/line/util/exception/CommonResult.java @@ -15,7 +15,7 @@ import lombok.NoArgsConstructor; public class CommonResult { private Integer code; private String msg; - private T data; + private T result; public CommonResult(Integer code, String msg) { this.code = code; diff --git a/src/main/java/com/soft/line/util/exception/ResultData.java b/src/main/java/com/soft/line/util/exception/ResultData.java index 721c2d5..2f917e1 100644 --- a/src/main/java/com/soft/line/util/exception/ResultData.java +++ b/src/main/java/com/soft/line/util/exception/ResultData.java @@ -9,7 +9,7 @@ public class ResultData implements Serializable { private String msg; - private Object data; + private Object result; public String getStatus() { @@ -31,19 +31,19 @@ public class ResultData implements Serializable { this.msg = msg; } - public Object getData() { + public Object getResult() { - return data; + return result; } - public void setData(final Object data) { + public void setResult(final Object result) { - this.data = data; + this.result = result; } - public ResultData(final String status, final String msg, final Object data) { + public ResultData(final String status, final String msg, final Object result) { super(); - this.data = data; + this.result = result; this.status = status; this.msg = msg; } -- Gitee From d064fdc22059d8e9282f1020073ffa60b0f2eaec Mon Sep 17 00:00:00 2001 From: wuxueqiao <17625808004@163.com> Date: Tue, 26 May 2020 15:21:19 +0800 Subject: [PATCH 041/211] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/soft/line/aop/PermissionAspect.java | 6 +- .../soft/line/controller/LoginController.java | 14 ++++- .../line/controller/UserInfoController.java | 55 ++++++++++++++++--- .../soft/line/service/UserInfoService.java | 2 + .../line/service/impl/LoginServiceImpl.java | 10 ++-- .../service/impl/UserInfoServiceImpl.java | 18 ++++++ .../soft/line/util/exception/ResultData.java | 8 +-- 7 files changed, 93 insertions(+), 20 deletions(-) diff --git a/src/main/java/com/soft/line/aop/PermissionAspect.java b/src/main/java/com/soft/line/aop/PermissionAspect.java index 47d14a4..74183fe 100644 --- a/src/main/java/com/soft/line/aop/PermissionAspect.java +++ b/src/main/java/com/soft/line/aop/PermissionAspect.java @@ -25,6 +25,7 @@ import java.util.HashMap; import java.util.Map; /** + * 注解@Permission 业务逻辑 * @author wu.xueqiao on 2020/5/12. * @version 0.1 */ @@ -42,8 +43,8 @@ public class PermissionAspect { //环绕通知 @Around(value="@annotation(permission)") public Object checkPermission(ProceedingJoinPoint joinPoint, Permission permission) throws Throwable{ - //获取请求session中的人员信息，判断人员所具有的权限，权限符合则继续，不符合则抛出相关提醒； - log.info("------开始校验权限------"); + //获取请求token中的人员信息，判断人员所具有的权限，权限符合则继续，不符合则抛出相关提醒； + log.info("------开始校验用户操作权限------"); //获取请求客户端的个人信息 UserTokenDto userToken=HttpRequestUtil.getUserToken(); RequestAttributes requestAttributes = RequestContextHolder.getRequestAttributes(); @@ -62,6 +63,7 @@ public class PermissionAspect { //符合角色要求 继续执行 o=joinPoint.proceed(); }else { + //封装无操作权限 返回数据 response.setHeader("Content-type","application/json; charset=UTF-8"); OutputStream outputStream=response.getOutputStream(); CommonResult commonResult=CommonResult.failed("err：您没有该权限"); diff --git a/src/main/java/com/soft/line/controller/LoginController.java b/src/main/java/com/soft/line/controller/LoginController.java index f6d5338..a61bf3f 100644 --- a/src/main/java/com/soft/line/controller/LoginController.java +++ b/src/main/java/com/soft/line/controller/LoginController.java @@ -4,6 +4,10 @@ package com.soft.line.controller; import com.soft.line.service.LoginService; import com.soft.line.util.exception.CommonResult; import com.soft.line.util.exception.ResultData; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -15,6 +19,7 @@ import java.util.Map; * @author wu.xueqiao on 2020/5/8. * @version 0.1 */ +@Api(description = "登录相关接口") @Slf4j @RestController @RequestMapping("/auth") @@ -24,11 +29,18 @@ public class LoginController { private LoginService loginService; + @ApiOperation(value = "登录", notes = "登录系统") + @ApiImplicitParams({ + @ApiImplicitParam(paramType = "query", name = "userame", value = "账号", required = false, dataType = "String"), + @ApiImplicitParam(paramType = "query", name = "password", value = "密码", required = false, dataType = "String") + }) @PostMapping("/login") public ResultData loginUserInfo(@RequestBody Map map){ return loginService.userLogin(map); } - + @ApiOperation(value = "登出", notes = "登出系统") + @ApiImplicitParams({ + }) @PostMapping("/loginout") public ResultData exitUser(){ return loginService.loginOut(); diff --git a/src/main/java/com/soft/line/controller/UserInfoController.java b/src/main/java/com/soft/line/controller/UserInfoController.java index 7c01a5a..b045239 100644 --- a/src/main/java/com/soft/line/controller/UserInfoController.java +++ b/src/main/java/com/soft/line/controller/UserInfoController.java @@ -4,6 +4,10 @@ import com.soft.line.aop.Permission; import com.soft.line.entity.UserInfo; import com.soft.line.service.UserInfoService; import com.soft.line.util.exception.CommonResult; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -13,8 +17,9 @@ import java.util.Map; * @author wu.xueqiao on 2020/5/22. * @version 0.1 */ +@Api(description = "用户管理相关接口") @RestController -@RequestMapping("/user") +@RequestMapping("/systemAdmin") public class UserInfoController { @@ -26,17 +31,27 @@ public class UserInfoController { * @param userInfo * @return */ - @PostMapping("/addUser") + @ApiOperation(value = "添加&&修改用户", notes = "添加&&修改用户") + @ApiImplicitParams({ + @ApiImplicitParam(paramType = "query", name = "userInfo", value = "账号", required = false, dataType = "com.soft.line.entity.UserInfo"), + }) + @PostMapping("/account") public CommonResult addUser(@RequestBody UserInfo userInfo){ int result=userInfoService.addUser(userInfo); if(result==1){ - return CommonResult.success(null); + return CommonResult.success("保存成功"); }else { return CommonResult.failed(); } } - @PostMapping("/getAllUsers") + @ApiOperation(value = "获取用户列表&&模糊查询", notes = "获取用户列表") + @ApiImplicitParams({ + @ApiImplicitParam(paramType = "query", name = "pageSize", value = "页量", required = false, dataType = "java.lang.Integer"), + @ApiImplicitParam(paramType = "query", name = "pageNum", value = "页码", required = false, dataType = "java.lang.Integer"), + @ApiImplicitParam(paramType = "query", name = "map", value = "模糊匹配条件", required = false, dataType = "java.util.Map") + }) + @PostMapping("/accounts") public CommonResult getAllUsers(@RequestBody Map map){ return CommonResult.success(userInfoService.getAllUsers(map)); } @@ -47,19 +62,43 @@ public class UserInfoController { * @param id * @return */ + @ApiOperation(value = "删除用户", notes = "删除用户") + @ApiImplicitParams({ + @ApiImplicitParam(paramType = "query", name = "id", value = "userId", required = true, dataType = "java.lang.Integer"), + }) @Permission - @DeleteMapping("/delUser") + @DeleteMapping("/account") public CommonResult delUser(@RequestParam("id") int id){ int result=userInfoService.delUser(id); if(result==1){ - return CommonResult.success(null); + return CommonResult.success("删除成功"); }else { return CommonResult.failed(); } } - - @GetMapping("/getUserInfo") + @ApiOperation(value = "获取单个用户信息", notes = "获取用户信息") + @ApiImplicitParams({ + @ApiImplicitParam(paramType = "query", name = "id", value = "userId", required = false, dataType = "java.lang.Integer"), + }) + @GetMapping("/accounts") public CommonResult getUserInfo(@RequestParam("id") int id){ return CommonResult.success(userInfoService.getUserInfo(id)); } + + @ApiOperation(value = "修改用户密码", notes = "修改用户密码") + @ApiImplicitParams({ + @ApiImplicitParam(paramType = "query", name = "id", value = "userId", required = true, dataType = "java.lang.Integer"), + @ApiImplicitParam(paramType = "query", name = "oldPassword", value = "oldPassword", required = true, dataType = "java.lang.String"), + @ApiImplicitParam(paramType = "query", name = "newPassword", value = "newPassword", required = true, dataType = "java.lang.String"), + @ApiImplicitParam(paramType = "query", name = "confirmPassword", value = "confirmPassword", required = true, dataType = "java.lang.String") + }) + @PostMapping("/changePassword") + public CommonResult changePassword(@RequestBody Map map){ + Boolean result=userInfoService.changePassword(map); + if(result){ + return CommonResult.success("修改成功"); + }else { + return CommonResult.failed(); + } + } } diff --git a/src/main/java/com/soft/line/service/UserInfoService.java b/src/main/java/com/soft/line/service/UserInfoService.java index 2d61314..006ccab 100644 --- a/src/main/java/com/soft/line/service/UserInfoService.java +++ b/src/main/java/com/soft/line/service/UserInfoService.java @@ -20,4 +20,6 @@ public interface UserInfoService { int addUser(UserInfo userInfo); + Boolean changePassword(Map map); + } diff --git a/src/main/java/com/soft/line/service/impl/LoginServiceImpl.java b/src/main/java/com/soft/line/service/impl/LoginServiceImpl.java index 6379837..f76de05 100644 --- a/src/main/java/com/soft/line/service/impl/LoginServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/LoginServiceImpl.java @@ -44,11 +44,11 @@ public class LoginServiceImpl implements LoginService { String token=returnToken(user); user.setToken(token); if (token == null || "".equals(token)) { - return new ResultData("0", "redis插入失败", null); + return new ResultData(0, "redis插入失败", null); } - return new ResultData("1", "登录成功", user); + return new ResultData(200, "登录成功", user); }else{ - return new ResultData("201","登录失败！",null); + return new ResultData(500,"登录失败！",null); } } @@ -58,9 +58,9 @@ public class LoginServiceImpl implements LoginService { String key=userTokenDto.getUserName(); boolean out=REDIS_SERVICE.del(key); if(out){ - return new ResultData("200","退出登录成功！",null); + return new ResultData(200,"退出登录成功！",null); }else { - return new ResultData("500","退出登录失败！",null); + return new ResultData(500,"退出登录失败！",null); } } diff --git a/src/main/java/com/soft/line/service/impl/UserInfoServiceImpl.java b/src/main/java/com/soft/line/service/impl/UserInfoServiceImpl.java index 02c08ab..ea949b3 100644 --- a/src/main/java/com/soft/line/service/impl/UserInfoServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/UserInfoServiceImpl.java @@ -61,5 +61,23 @@ public class UserInfoServiceImpl implements UserInfoService { } + @Override + public Boolean changePassword(Map map) { + int id=Integer.valueOf(map.get("id").toString()); + UserInfo userInfo=userInfoMapper.selectByPrimaryKey(id); + String password=userInfo.getPassword(); + String oldPassword=map.get("oldPassword").toString(); + String newPassword=map.get("newPassword").toString(); + String confirmPassword=map.get("confirmPassword").toString(); + if(password.equals(oldPassword) && newPassword.equals(confirmPassword)){ + userInfo.setPassword(newPassword); + int update=userInfoMapper.updateUserInfo(userInfo); + if(update==1){ + return true; + } + } + return false; + } + } diff --git a/src/main/java/com/soft/line/util/exception/ResultData.java b/src/main/java/com/soft/line/util/exception/ResultData.java index 721c2d5..04cd273 100644 --- a/src/main/java/com/soft/line/util/exception/ResultData.java +++ b/src/main/java/com/soft/line/util/exception/ResultData.java @@ -5,18 +5,18 @@ import java.io.Serializable; public class ResultData implements Serializable { private static final long serialVersionUID = 6342989717148610893L; - private String status; + private int status; private String msg; private Object data; - public String getStatus() { + public int getStatus() { return status; } - public void setStatus(final String status) { + public void setStatus(final int status) { this.status = status; } @@ -41,7 +41,7 @@ public class ResultData implements Serializable { this.data = data; } - public ResultData(final String status, final String msg, final Object data) { + public ResultData(final int status, final String msg, final Object data) { super(); this.data = data; this.status = status; -- Gitee From 2b7ed6f2f58d35f2c0a438e3ae1c7710f9760852 Mon Sep 17 00:00:00 2001 From: ljc <1119265069@qq.com> Date: Tue, 26 May 2020 21:58:20 +0800 Subject: [PATCH 042/211] =?UTF-8?q?menuinfo=E5=A2=9E=E5=88=A0=E6=94=B9?= =?UTF-8?q?=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../soft/line/controller/MenuController.java | 14 +++++------ .../soft/line/mapper/ButtonInfoMapper.java | 2 +- .../com/soft/line/mapper/ButtonInfoMapper.xml | 4 +-- .../line/mapper/MenuButtonInfoMapper.java | 4 +++ .../com/soft/line/mapper/MenuInfoMapper.java | 2 +- .../com/soft/line/mapper/MenuInfoMapper.xml | 4 +-- .../soft/line/service/ButtonInfoService.java | 2 +- .../service/impl/ButtonInfoServiceImpl.java | 4 +-- .../service/impl/MenuInfoServiceImpl.java | 25 +++++++++++-------- 9 files changed, 34 insertions(+), 27 deletions(-) diff --git a/src/main/java/com/soft/line/controller/MenuController.java b/src/main/java/com/soft/line/controller/MenuController.java index 70e02c3..f1d10c8 100644 --- a/src/main/java/com/soft/line/controller/MenuController.java +++ b/src/main/java/com/soft/line/controller/MenuController.java @@ -99,8 +99,8 @@ public class MenuController { menuInfo.setModifyTime(new Date()); menuInfo.setModifyPerson("admin"); List buttonInfos =new ArrayList(); - for (String buttonName : (List)map.get("buttonList")){ - ButtonInfo buttonInfo = buttonInfoService.selectByButtonName(buttonName); + for (String buttonId : (List)map.get("buttonList")){ + ButtonInfo buttonInfo = buttonInfoService.selectByButtonId(buttonId); buttonInfos.add(buttonInfo); } menuInfo.setButtonInfoList(buttonInfos); @@ -150,13 +150,13 @@ public class MenuController { menuInfo.setModifyTime(new Date()); menuInfo.setModifyPerson("admin"); List buttonInfos =new ArrayList(); - for (String buttonName : (List)map.get("buttonList")){ - ButtonInfo buttonInfo = buttonInfoService.selectByButtonName(buttonName); + for (String buttonId : (List)map.get("buttonList")){ + ButtonInfo buttonInfo = buttonInfoService.selectByButtonId(buttonId); buttonInfos.add(buttonInfo); } - - menuInfoService.updateMenInfo(menuInfo); - return new ResultData("200","修改菜单成功",null); + menuInfo.setButtonInfoList(buttonInfos); + menuInfoService.updateMenInfo(menuInfo); + return new ResultData("200","修改菜单成功",null); } } diff --git a/src/main/java/com/soft/line/mapper/ButtonInfoMapper.java b/src/main/java/com/soft/line/mapper/ButtonInfoMapper.java index a0049af..52efe25 100644 --- a/src/main/java/com/soft/line/mapper/ButtonInfoMapper.java +++ b/src/main/java/com/soft/line/mapper/ButtonInfoMapper.java @@ -15,5 +15,5 @@ public interface ButtonInfoMapper { List selectButtonsByMenuId(Integer menuId); - ButtonInfo selectByButtonName(String buttonName); + ButtonInfo selectByButtonId(String buttonId); } \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/ButtonInfoMapper.xml b/src/main/java/com/soft/line/mapper/ButtonInfoMapper.xml index 935d7fc..e0b8f2f 100644 --- a/src/main/java/com/soft/line/mapper/ButtonInfoMapper.xml +++ b/src/main/java/com/soft/line/mapper/ButtonInfoMapper.xml @@ -18,10 +18,10 @@ where `code_type` = '4' and mbi.button_id = cd.code_detail and mbi.menu_id = #{menuId,jdbcType=INTEGER} - select `code_detail`, `code_content1`, `code_content2` from `code_detail` cd - where `code_type` = '4' and code_content2 = #{buttonName,jdbcType=VARCHAR} + where `code_type` = '4' and code_detail = #{buttonId,jdbcType=VARCHAR} \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/MenuButtonInfoMapper.java b/src/main/java/com/soft/line/mapper/MenuButtonInfoMapper.java index eeac1dd..3f990f0 100644 --- a/src/main/java/com/soft/line/mapper/MenuButtonInfoMapper.java +++ b/src/main/java/com/soft/line/mapper/MenuButtonInfoMapper.java @@ -4,6 +4,7 @@ import com.soft.line.entity.MenuButtonInfo; import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import java.util.List; @@ -38,4 +39,7 @@ public interface MenuButtonInfoMapper { * @mbggenerated */ List selectAll(); + + @Select("select button_id from menu_button_info where menu_id= #{menuId}") + List selectButtonIdByMenuId(Integer menuId); } \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/MenuInfoMapper.java b/src/main/java/com/soft/line/mapper/MenuInfoMapper.java index c8da799..130d408 100644 --- a/src/main/java/com/soft/line/mapper/MenuInfoMapper.java +++ b/src/main/java/com/soft/line/mapper/MenuInfoMapper.java @@ -41,7 +41,7 @@ public interface MenuInfoMapper { int countMenuName(@Param("id") Integer id,@Param("menuName") String menuName); - int countOrderBy(@Param("id") Integer id,@Param("orderBy") String orderBy); + int countOrderBy(@Param("id") Integer id,@Param("ory") String orderBy); @Select("select menu_name from menu_info") List selectALlMenuName(); diff --git a/src/main/java/com/soft/line/mapper/MenuInfoMapper.xml b/src/main/java/com/soft/line/mapper/MenuInfoMapper.xml index 6182f5e..b48e5bf 100644 --- a/src/main/java/com/soft/line/mapper/MenuInfoMapper.xml +++ b/src/main/java/com/soft/line/mapper/MenuInfoMapper.xml @@ -33,7 +33,7 @@ `orderby` = #{orderby,jdbcType=VARCHAR}, `p_id` = #{pId,jdbcType=INTEGER}, `modify_person` = #{modifyPerson,jdbcType=VARCHAR}, - `modify_time` = #{modifyTime,jdbcType=TIMESTAMP}) + `modify_time` = #{modifyTime,jdbcType=TIMESTAMP} where `id` = #{id,jdbcType=INTEGER} @@ -70,7 +70,7 @@ select `code_detail`, `code_content1`, `code_content2` from `code_detail` where `code_type` = '4' + order by `orderby` + + + \ No newline at end of file diff --git a/src/main/java/com/soft/line/service/MenuInfoService.java b/src/main/java/com/soft/line/service/MenuInfoService.java index d373a3c..d2647b9 100644 --- a/src/main/java/com/soft/line/service/MenuInfoService.java +++ b/src/main/java/com/soft/line/service/MenuInfoService.java @@ -29,4 +29,9 @@ public interface MenuInfoService { public void updateMenInfo(MenuInfo menuInfo); public void delete(Integer id); + + public List selectTopMenu(); + + //获取所有有操作按钮的菜单 + public List selectSonMenus(); } diff --git a/src/main/java/com/soft/line/service/impl/MenuInfoServiceImpl.java b/src/main/java/com/soft/line/service/impl/MenuInfoServiceImpl.java index 71a919a..e58652d 100644 --- a/src/main/java/com/soft/line/service/impl/MenuInfoServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/MenuInfoServiceImpl.java @@ -120,6 +120,22 @@ public class MenuInfoServiceImpl implements MenuInfoService { menuInfoMapper.delete(id); } + @Override + public List selectTopMenu() { + return menuInfoMapper.selectTopMenu(); + } + + @Override + public List selectSonMenus() { + List menuInfoList= menuInfoMapper.selectMenusInMenuButton(); + List resultList = new ArrayList(); + for (MenuInfo menuInfo : menuInfoList){ + menuInfo.setButtonInfoList(buttonInfoMapper.selectButtonsByMenuId(menuInfo.getId())); + resultList.add(menuInfo); + } + return resultList; + } + //取两个list的差集 private static List getDiffrent(List list1, List list2) { List list3 = new ArrayList(); -- Gitee From 84820a6701ad5e9259e06f98849755582b355d27 Mon Sep 17 00:00:00 2001 From: ljc Date: Wed, 27 May 2020 15:47:18 +0800 Subject: [PATCH 045/211] =?UTF-8?q?=E5=8F=96=E6=B6=88mapping=E6=B3=A8?= =?UTF-8?q?=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/soft/line/controller/MenuController.java | 8 ++++---- .../java/com/soft/line/mapper/ButtonInfoMapper.java | 1 - .../com/soft/line/mapper/MenuButtonInfoMapper.java | 3 --- .../com/soft/line/mapper/MenuButtonInfoMapper.xml | 13 +++++++++++++ .../java/com/soft/line/mapper/MenuInfoMapper.java | 3 --- .../java/com/soft/line/mapper/MenuInfoMapper.xml | 8 ++++++++ 6 files changed, 25 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/soft/line/controller/MenuController.java b/src/main/java/com/soft/line/controller/MenuController.java index 1142204..df446b1 100644 --- a/src/main/java/com/soft/line/controller/MenuController.java +++ b/src/main/java/com/soft/line/controller/MenuController.java @@ -30,7 +30,7 @@ public class MenuController { @Autowired private ButtonInfoService buttonInfoService; - @GetMapping("/menus") + @PostMapping("/menus") @ApiOperation(value = "查询所有菜单列表") public CommonResult> getAllMenus(@RequestBody Map map) { return CommonResult.success(menuInfoService.selectAll(map)); @@ -53,14 +53,14 @@ public class MenuController { } @ApiOperation(value = "删除菜单") - @DeleteMapping("/menus") + @DeleteMapping("/menu") public ResultData deleteMenu(@RequestBody Map map){ menuInfoService.delete((Integer) map.get("id")); return new ResultData("200","删除成功",null); } @ApiOperation(value = "添加菜单") - @PostMapping("/menus") + @PostMapping("/menu") public ResultData addMenu(@RequestBody Map map) { MenuInfo menuInfo = new MenuInfo(); if (map.get("menuName")==null){ @@ -110,7 +110,7 @@ public class MenuController { } @ApiOperation(value = "修改菜单") - @PutMapping("/menus") + @PutMapping("/menu") public ResultData editMenu(@RequestBody Map map) { MenuInfo menuInfo = new MenuInfo(); menuInfo.setId((Integer) map.get("id")); diff --git a/src/main/java/com/soft/line/mapper/ButtonInfoMapper.java b/src/main/java/com/soft/line/mapper/ButtonInfoMapper.java index 52efe25..0362247 100644 --- a/src/main/java/com/soft/line/mapper/ButtonInfoMapper.java +++ b/src/main/java/com/soft/line/mapper/ButtonInfoMapper.java @@ -8,7 +8,6 @@ import org.apache.ibatis.annotations.Select; import java.util.List; -@Mapper public interface ButtonInfoMapper { List selectAll(); diff --git a/src/main/java/com/soft/line/mapper/MenuButtonInfoMapper.java b/src/main/java/com/soft/line/mapper/MenuButtonInfoMapper.java index 3f990f0..b1c4edb 100644 --- a/src/main/java/com/soft/line/mapper/MenuButtonInfoMapper.java +++ b/src/main/java/com/soft/line/mapper/MenuButtonInfoMapper.java @@ -18,10 +18,8 @@ public interface MenuButtonInfoMapper { */ int insert(MenuButtonInfo record); - @Delete("delete from menu_button_info where menu_id=#{menuId} and button_id=#{buttonId}") int delete(@Param("menuId") int menuId,@Param("buttonId") String buttonId); - @Delete("delete from role_menu where menu_button_id = (select mbi.id from menu_button_info mbi where mbi.menu_id=#{menuId} and mbi.button_id=#{buttonId})") int deleteRoleMenu(@Param("menuId") int menuId,@Param("buttonId") String buttonId); /** @@ -40,6 +38,5 @@ public interface MenuButtonInfoMapper { */ List selectAll(); - @Select("select button_id from menu_button_info where menu_id= #{menuId}") List selectButtonIdByMenuId(Integer menuId); } \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/MenuButtonInfoMapper.xml b/src/main/java/com/soft/line/mapper/MenuButtonInfoMapper.xml index f75c0d7..7dc12ff 100644 --- a/src/main/java/com/soft/line/mapper/MenuButtonInfoMapper.xml +++ b/src/main/java/com/soft/line/mapper/MenuButtonInfoMapper.xml @@ -32,4 +32,17 @@ from `menu_button_info` t left join code_detail cd on cd.code_type='4' and cd.code_detail = t.button_id where `menu_id` = #{menuId} + + + + + delete from menu_button_info where menu_id=#{menuId} and button_id=#{buttonId} + + + + delete from role_menu where menu_button_id = (select mbi.id from menu_button_info mbi where mbi.menu_id=#{menuId} and mbi.button_id=#{buttonId}) + + \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/MenuInfoMapper.java b/src/main/java/com/soft/line/mapper/MenuInfoMapper.java index 7091d8e..48b50e6 100644 --- a/src/main/java/com/soft/line/mapper/MenuInfoMapper.java +++ b/src/main/java/com/soft/line/mapper/MenuInfoMapper.java @@ -8,7 +8,6 @@ import org.apache.ibatis.annotations.Select; import java.util.List; -@Mapper public interface MenuInfoMapper { /** * This method was generated by MyBatis Generator. @@ -20,7 +19,6 @@ public interface MenuInfoMapper { int update(MenuInfo record); - @Delete("delete from menu_info where id = #{id}") int delete(Integer id); int deleteMenuButtonInfo(Integer menuId); @@ -45,7 +43,6 @@ public interface MenuInfoMapper { int countOrderBy(@Param("id") Integer id,@Param("ory") String orderBy); //获取所有菜单名 - @Select("select menu_name from menu_info") List selectALlMenuName(); //获取顶级菜单 diff --git a/src/main/java/com/soft/line/mapper/MenuInfoMapper.xml b/src/main/java/com/soft/line/mapper/MenuInfoMapper.xml index d9ca5a3..93a519c 100644 --- a/src/main/java/com/soft/line/mapper/MenuInfoMapper.xml +++ b/src/main/java/com/soft/line/mapper/MenuInfoMapper.xml @@ -37,6 +37,10 @@ where `id` = #{id,jdbcType=INTEGER} + + delete from menu_info where id = #{id} + + delete from menu_button_info where menu_id =(select mi.id from menu_info mi where mi.id=#{menuId}) @@ -76,6 +80,10 @@ + + + + + select menu_name from menu_info + + + and menu_name like concat('%', #{menuName} ,'%') + + + and menu_url like concat('%', #{menuUrl} ,'%') + + select menu_name from menu_info - - - and menu_name like concat('%', #{menuName} ,'%') - - - and menu_url like concat('%', #{menuUrl} ,'%') - - - + + - + select `id`, `menu_id`, `button_id`, `modify_person`, `modify_time` from `menu_button_info` + + + + + + + delete from menu_button_info where menu_id=#{menuId} and button_id=#{buttonId} + + + + delete from role_menu where menu_button_id = (select mbi.id from menu_button_info mbi where mbi.menu_id=#{menuId} and mbi.button_id=#{buttonId}) + + \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/MenuInfoMapper.java b/src/main/java/com/soft/line/mapper/MenuInfoMapper.java index e247728..d373720 100644 --- a/src/main/java/com/soft/line/mapper/MenuInfoMapper.java +++ b/src/main/java/com/soft/line/mapper/MenuInfoMapper.java @@ -1,8 +1,12 @@ package com.soft.line.mapper; import com.soft.line.entity.MenuInfo; +import org.apache.ibatis.annotations.Delete; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + import java.util.List; -import java.util.Map; public interface MenuInfoMapper { /** @@ -13,23 +17,34 @@ public interface MenuInfoMapper { */ int insert(MenuInfo record); - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table menu_info - * - * @mbggenerated - */ + int update(MenuInfo record); + + int delete(Integer id); + + int deleteMenuButtonInfo(Integer menuId); + + int deleteRoleMenu(Integer menuId); + MenuInfo selectByPrimaryKey(Integer id); - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table menu_info - * - * @mbggenerated - */ - List selectAll(); + //获取该菜单的父级菜单 + MenuInfo selectParentMenu(Integer pid); + + List selectAll(@Param("menuName") String menuName,@Param("menuUrl") String menuUrl); + + int countMenuName(@Param("id") Integer id,@Param("menuName") String menuName); + + int countOrderBy(@Param("id") Integer id,@Param("ory") String orderBy); + + //获取所有菜单名 + List selectALlMenuName(); + + //获取顶级菜单 + List selectTopMenu(); + + //查询menu_button_info中的menu + List selectMenusInMenuButton(); + - List getAllMenuForRole(Map map); - List getAllParentMenu(); } \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/MenuInfoMapper.xml b/src/main/java/com/soft/line/mapper/MenuInfoMapper.xml index 84c9743..d0dee4b 100644 --- a/src/main/java/com/soft/line/mapper/MenuInfoMapper.xml +++ b/src/main/java/com/soft/line/mapper/MenuInfoMapper.xml @@ -1,77 +1,112 @@ - - - - - - - - - - - - - - - insert into `menu_info` (`menu_icon`, `menu_name`, `state`, - `menu_url`, `oredby`, `p_id`, + + + + + + + + + + + + + + insert into `menu_info` (`menu_icon`, `menu_name`, `state`, + `menu_url`, `orderby`, `p_id`, `modify_person`, `modify_time`) - values (#{menuIcon,jdbcType=VARCHAR}, #{menuName,jdbcType=VARCHAR}, #{state,jdbcType=INTEGER}, - #{menuUrl,jdbcType=VARCHAR}, #{oredby,jdbcType=VARCHAR}, #{pId,jdbcType=INTEGER}, + values (#{menuIcon,jdbcType=VARCHAR}, #{menuName,jdbcType=VARCHAR}, #{state,jdbcType=INTEGER}, + #{menuUrl,jdbcType=VARCHAR}, #{orderby,jdbcType=VARCHAR}, #{pId,jdbcType=INTEGER}, #{modifyPerson,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}) - + select `id`, `menu_icon`, `menu_name`, `state`, `menu_url`, `orderby`, `p_id`, `modify_person`, `modify_time` from `menu_info` where `id` = #{id,jdbcType=INTEGER} - + select `id`, `menu_icon`, `menu_name`, `state`, `menu_url`, `orderby`, `p_id`, `modify_person`, + `modify_time` + from `menu_info` + + + and menu_name like concat('%', #{menuName} ,'%') + + + and menu_url like concat('%', #{menuUrl} ,'%') + + + + + + + + + - - + select `id`, `menu_icon`, `menu_name`, `state`, `menu_url`, `orderby`, `p_id`, `modify_person`, + `modify_time` + from menu_info where id = #{pid} - - + select `id`, `menu_icon`, `menu_name`, `state`, `menu_url`, `orderby`, `p_id`, `modify_person`, `modify_time` - from `menu_info` - WHERE `p_id`=-1 + from `menu_info` where `p_id` = -1 + \ No newline at end of file diff --git a/src/main/java/com/soft/line/service/MenuInfoService.java b/src/main/java/com/soft/line/service/MenuInfoService.java index 3773ea3..d2647b9 100644 --- a/src/main/java/com/soft/line/service/MenuInfoService.java +++ b/src/main/java/com/soft/line/service/MenuInfoService.java @@ -1,17 +1,37 @@ package com.soft.line.service; +import com.github.pagehelper.PageInfo; +import com.soft.line.entity.ButtonInfo; +import com.soft.line.entity.MenuButtonInfo; import com.soft.line.entity.MenuInfo; import java.util.List; import java.util.Map; -/** - * @author wu.xueqiao on 2020/5/21. - * @version 0.1 - */ public interface MenuInfoService { - public List getAllMenuForRole(Map map); + public PageInfo selectAll(final Map map); - public List getAllParentMenu(); + public List selectButtonsByMenuId(Integer menuId); + + public MenuInfo selectByPrimaryKey(Integer id); + + public MenuInfo selectParentMenu(Integer pid); + + public int countMenuName(Integer id,String menuName); + + public int countOrderBy(Integer id,String orderBy); + + public List selectALlMenuName(); + + public void addMenuInfo(MenuInfo menuInfo); + + public void updateMenInfo(MenuInfo menuInfo); + + public void delete(Integer id); + + public List selectTopMenu(); + + //获取所有有操作按钮的菜单 + public List selectSonMenus(); } diff --git a/src/main/java/com/soft/line/service/impl/MenuInfoServiceImpl.java b/src/main/java/com/soft/line/service/impl/MenuInfoServiceImpl.java index 562f2e2..aad319c 100644 --- a/src/main/java/com/soft/line/service/impl/MenuInfoServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/MenuInfoServiceImpl.java @@ -1,32 +1,147 @@ package com.soft.line.service.impl; +import com.github.pagehelper.PageInfo; +import com.soft.line.entity.ButtonInfo; +import com.soft.line.entity.MenuButtonInfo; import com.soft.line.entity.MenuInfo; +import com.soft.line.mapper.ButtonInfoMapper; +import com.soft.line.mapper.MenuButtonInfoMapper; import com.soft.line.mapper.MenuInfoMapper; import com.soft.line.service.MenuInfoService; +import com.soft.line.util.pagehelper.PageUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; +import java.util.Date; import java.util.List; import java.util.Map; -/** - * @author wu.xueqiao on 2020/5/21. - * @version 0.1 - */ @Service @Slf4j public class MenuInfoServiceImpl implements MenuInfoService { @Autowired private MenuInfoMapper menuInfoMapper; + @Autowired + private ButtonInfoMapper buttonInfoMapper; + @Autowired + private MenuButtonInfoMapper menuButtonInfoMapper; + + @Override + public PageInfo selectAll(final Map map) { + PageUtil.setPageParam(map); + //String menuName = (String)map.get("menuName"); + List menuInfoList = menuInfoMapper.selectAll((String)map.get("menuName"),(String)map.get("menuUrl")); + for (MenuInfo menuInfo:menuInfoList) { + menuInfo.setButtonInfoList(selectButtonsByMenuId(menuInfo.getId())); + } + PageInfo menuInfoPage =new PageInfo(menuInfoList); + return menuInfoPage; + } + + @Override + public List selectButtonsByMenuId(Integer menuId) { + return buttonInfoMapper.selectButtonsByMenuId(menuId); + } + + @Override + public MenuInfo selectByPrimaryKey(Integer id) { + MenuInfo menuInfo = menuInfoMapper.selectByPrimaryKey(id); + menuInfo.setButtonInfoList(buttonInfoMapper.selectButtonsByMenuId((id))); + return menuInfo; + } + + @Override + public MenuInfo selectParentMenu(Integer pid) { + return menuInfoMapper.selectParentMenu(pid); + } + + @Override + public int countMenuName(Integer id,String menuName) { + return menuInfoMapper.countMenuName(id,menuName); + } + @Override - public List getAllMenuForRole(Map map) { - return menuInfoMapper.getAllMenuForRole(map); + public int countOrderBy(Integer id,String orderBy) { + return menuInfoMapper.countOrderBy(id,orderBy); } @Override - public List getAllParentMenu() { - return menuInfoMapper.getAllParentMenu(); + public List selectALlMenuName() { + return menuInfoMapper.selectALlMenuName(); + } + + @Override + public void addMenuInfo(MenuInfo menuInfo) { + menuInfoMapper.insert(menuInfo); + for (ButtonInfo buttonInfo : menuInfo.getButtonInfoList()) { + MenuButtonInfo menuButtonInfo = new MenuButtonInfo(); + menuButtonInfo.setMenuId(menuInfo.getId()); + menuButtonInfo.setButtonId(buttonInfo.getButtonId()); + menuButtonInfo.setModifyPerson(menuInfo.getModifyPerson()); + menuButtonInfo.setModifyTime(new Date()); + menuButtonInfoMapper.insert(menuButtonInfo); + } + } + + @Override + public void updateMenInfo(MenuInfo menuInfo) { + menuInfoMapper.update(menuInfo); + List oldButtonList = menuButtonInfoMapper.selectButtonIdByMenuId(menuInfo.getId()); + List newButtonList = new ArrayList(); + for (ButtonInfo bi:menuInfo.getButtonInfoList()){ + newButtonList.add(bi.getButtonId()); + } + //旧的比新的多，删除旧的 + List dealOldButtonList = getDiffrent(oldButtonList,newButtonList); + for (String buttonId : dealOldButtonList) { + menuButtonInfoMapper.deleteRoleMenu(menuInfo.getId(),buttonId); + menuButtonInfoMapper.delete(menuInfo.getId(),buttonId); + } + //新的比旧的多，新增新的 + List dealNewButtonList = getDiffrent(newButtonList,oldButtonList); + for (String buttonId : dealNewButtonList) { + MenuButtonInfo menuButtonInfo = new MenuButtonInfo(); + menuButtonInfo.setMenuId(menuInfo.getId()); + menuButtonInfo.setButtonId(buttonId); + menuButtonInfo.setModifyPerson(menuInfo.getModifyPerson()); + menuButtonInfo.setModifyTime(new Date()); + menuButtonInfoMapper.insert(menuButtonInfo); + } + } + + @Override + @Transactional + public void delete(Integer id) { + menuInfoMapper.deleteRoleMenu(id); + menuInfoMapper.deleteMenuButtonInfo(id); + menuInfoMapper.delete(id); + } + + @Override + public List selectTopMenu() { + return menuInfoMapper.selectTopMenu(); + } + + @Override + public List selectSonMenus() { + List menuInfoList= menuInfoMapper.selectMenusInMenuButton(); + List resultList = new ArrayList(); + for (MenuInfo menuInfo : menuInfoList){ + menuInfo.setButtonInfoList(buttonInfoMapper.selectButtonsByMenuId(menuInfo.getId())); + resultList.add(menuInfo); + } + return resultList; + } + + //取两个list的差集 + private static List getDiffrent(List list1, List list2) { + List list3 = new ArrayList(); + list3.addAll(list1); + list3.removeAll(list2); + return list3; } } -- Gitee From a22ec9211fd040638ca4b847660c5334ca279a89 Mon Sep 17 00:00:00 2001 From: ljc Date: Thu, 28 May 2020 14:19:06 +0800 Subject: [PATCH 054/211] menu --- .../soft/line/controller/MenuController.java | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/soft/line/controller/MenuController.java b/src/main/java/com/soft/line/controller/MenuController.java index 5f8639f..1480bed 100644 --- a/src/main/java/com/soft/line/controller/MenuController.java +++ b/src/main/java/com/soft/line/controller/MenuController.java @@ -56,7 +56,7 @@ public class MenuController { @DeleteMapping("/menu") public ResultData deleteMenu(@RequestBody Map map){ menuInfoService.delete((Integer) map.get("id")); - return new ResultData("200","删除成功",null); + return new ResultData(200,"删除成功",null); } @ApiOperation(value = "添加菜单") @@ -64,23 +64,23 @@ public class MenuController { public ResultData addMenu(@RequestBody Map map) { MenuInfo menuInfo = new MenuInfo(); if (map.get("menuName")==null){ - return new ResultData("200","菜单名称不能为空",null); + return new ResultData(200,"菜单名称不能为空",null); }else{ //新增时判断menuName是否重复 menuInfo.setMenuName(map.get("menuName").toString()); if (menuInfoService.countMenuName(menuInfo.getId(),menuInfo.getMenuName())>0){ - return new ResultData("200","菜单名称已存在",null); + return new ResultData(200,"菜单名称已存在",null); } } menuInfo.setMenuIcon(map.get("menuIcon")==null?"":map.get("menuIcon").toString()); menuInfo.setMenuUrl(map.get("menuUrl")==null?"":map.get("menuUrl").toString()); if (map.get("orderBy")==null){ - return new ResultData("200","菜单排序不能为空",null); + return new ResultData(200,"菜单排序不能为空",null); }else{ menuInfo.setOrderBy((map.get("orderBy")==null?"":map.get("orderBy").toString())); if (menuInfoService.countOrderBy(menuInfo.getId(),menuInfo.getOrderBy())>0){ - return new ResultData("200","菜单排序已存在",null); + return new ResultData(200,"菜单排序已存在",null); } } @@ -91,7 +91,7 @@ public class MenuController { }else { MenuInfo pMenu = menuInfoService.selectParentMenu(menuInfo.getpId()); if (pMenu==null){ - return new ResultData("200","父级菜单不存在",null); + return new ResultData(200,"父级菜单不存在",null); } menuInfo.setState(pMenu.getState()+1); } @@ -105,7 +105,7 @@ public class MenuController { } menuInfo.setButtonInfoList(buttonInfos); menuInfoService.addMenuInfo(menuInfo); - return new ResultData("200","添加菜单成功",null); + return new ResultData(200,"添加菜单成功",null); } @@ -115,23 +115,23 @@ public class MenuController { MenuInfo menuInfo = new MenuInfo(); menuInfo.setId((Integer) map.get("id")); if (map.get("menuName")==null){ - return new ResultData("200","菜单名称不能为空",null); + return new ResultData(200,"菜单名称不能为空",null); }else{ //新增时判断menuName是否重复 menuInfo.setMenuName(map.get("menuName").toString()); if (menuInfoService.countMenuName(menuInfo.getId(),menuInfo.getMenuName())>0){ - return new ResultData("200","菜单名称已存在",null); + return new ResultData(200,"菜单名称已存在",null); } } menuInfo.setMenuIcon(map.get("menuIcon")==null?"":map.get("menuIcon").toString()); menuInfo.setMenuUrl(map.get("menuUrl")==null?"":map.get("menuUrl").toString()); if (map.get("orderBy")==null){ - return new ResultData("200","菜单排序不能为空",null); + return new ResultData(200,"菜单排序不能为空",null); }else{ menuInfo.setOrderBy(map.get("orderBy")==null?"":map.get("orderBy").toString()); if (menuInfoService.countOrderBy(menuInfo.getId(),menuInfo.getOrderBy())>0){ - return new ResultData("200","菜单排序已存在",null); + return new ResultData(200,"菜单排序已存在",null); } } @@ -142,7 +142,7 @@ public class MenuController { }else { MenuInfo pMenu = menuInfoService.selectParentMenu(menuInfo.getpId()); if (pMenu==null){ - return new ResultData("200","父级菜单不存在",null); + return new ResultData(200,"父级菜单不存在",null); } menuInfo.setState(pMenu.getState()+1); } @@ -156,7 +156,7 @@ public class MenuController { } menuInfo.setButtonInfoList(buttonInfos); menuInfoService.updateMenInfo(menuInfo); - return new ResultData("200","修改菜单成功",null); + return new ResultData(200,"修改菜单成功",null); } } -- Gitee From 8f4349a0bd2b9a0f09565836ae608380f18c6c52 Mon Sep 17 00:00:00 2001 From: wuxueqiao <17625808004@163.com> Date: Thu, 28 May 2020 14:23:12 +0800 Subject: [PATCH 055/211] =?UTF-8?q?=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../line/controller/MenuInfoController.java | 42 ------------------- 1 file changed, 42 deletions(-) delete mode 100644 src/main/java/com/soft/line/controller/MenuInfoController.java diff --git a/src/main/java/com/soft/line/controller/MenuInfoController.java b/src/main/java/com/soft/line/controller/MenuInfoController.java deleted file mode 100644 index 2557fe2..0000000 --- a/src/main/java/com/soft/line/controller/MenuInfoController.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.soft.line.controller; - -import com.soft.line.service.MenuInfoService; -import com.soft.line.util.exception.CommonResult; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.Map; - -/** - * @Description 根据相应的角色获取菜单按钮权限 - * @author wu.xueqiao on 2020/5/21. - * @version 0.1 - */ -@Api(description = "菜单接口") -@RequestMapping("/menu") -@RestController -public class MenuInfoController { - - @Autowired - private MenuInfoService menuInfoService; - @ApiOperation(value = "菜单列表", notes = "查询角色对应菜单") - //设置请求参数 - @ApiImplicitParams({ - @ApiImplicitParam(paramType = "query", name = "username", value = "用户名", required = false, dataType = "String"), - @ApiImplicitParam(paramType = "query", name = "roleId", value = "角色ID", required = false, dataType = "int") - // ..... - }) - @PostMapping("/getMyMenus") - public CommonResult getAllMenuForRole(@RequestBody Map map){ - return CommonResult.success(menuInfoService.getAllMenuForRole(map)); - } - - @GetMapping("/getAllParentMenu") - public CommonResult getAllParentMenu(){ - return CommonResult.success(menuInfoService.getAllParentMenu()); - } -} -- Gitee From afe55c0658cee839a6ac373179dee6fa376f5e8c Mon Sep 17 00:00:00 2001 From: ljc Date: Thu, 28 May 2020 14:27:13 +0800 Subject: [PATCH 056/211] =?UTF-8?q?=E8=A7=92=E8=89=B2=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{MenuController.java => MenuInfoController.java} | 2 +- .../java/com/soft/line/controller/RoleInfoController.java | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) rename src/main/java/com/soft/line/controller/{MenuController.java => MenuInfoController.java} (99%) create mode 100644 src/main/java/com/soft/line/controller/RoleInfoController.java diff --git a/src/main/java/com/soft/line/controller/MenuController.java b/src/main/java/com/soft/line/controller/MenuInfoController.java similarity index 99% rename from src/main/java/com/soft/line/controller/MenuController.java rename to src/main/java/com/soft/line/controller/MenuInfoController.java index 1480bed..0b5dec5 100644 --- a/src/main/java/com/soft/line/controller/MenuController.java +++ b/src/main/java/com/soft/line/controller/MenuInfoController.java @@ -23,7 +23,7 @@ import java.util.*; @Slf4j @RestController @RequestMapping("/systemAdmin") -public class MenuController { +public class MenuInfoController { @Autowired private MenuInfoService menuInfoService; diff --git a/src/main/java/com/soft/line/controller/RoleInfoController.java b/src/main/java/com/soft/line/controller/RoleInfoController.java new file mode 100644 index 0000000..649c12b --- /dev/null +++ b/src/main/java/com/soft/line/controller/RoleInfoController.java @@ -0,0 +1,4 @@ +package com.soft.line.controller; + +public class RoleInfoController { +} -- Gitee From 96c1c5e0ed7cf5aa84a5ee5bcc4045b8e718e770 Mon Sep 17 00:00:00 2001 From: ljc Date: Thu, 28 May 2020 14:31:12 +0800 Subject: [PATCH 057/211] codeDetailMapper --- .../line/controller/RoleInfoController.java | 11 +++ .../soft/line/mapper/CodeDetailMapper.java | 5 ++ .../com/soft/line/mapper/CodeDetailMapper.xml | 67 ++++++++++--------- 3 files changed, 50 insertions(+), 33 deletions(-) diff --git a/src/main/java/com/soft/line/controller/RoleInfoController.java b/src/main/java/com/soft/line/controller/RoleInfoController.java index 649c12b..fa30288 100644 --- a/src/main/java/com/soft/line/controller/RoleInfoController.java +++ b/src/main/java/com/soft/line/controller/RoleInfoController.java @@ -1,4 +1,15 @@ package com.soft.line.controller; +import io.swagger.annotations.Api; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@Api(description = "菜单接口") +@Slf4j +@RestController +@RequestMapping("/systemAdmin") public class RoleInfoController { + + } diff --git a/src/main/java/com/soft/line/mapper/CodeDetailMapper.java b/src/main/java/com/soft/line/mapper/CodeDetailMapper.java index b66574d..ce39449 100644 --- a/src/main/java/com/soft/line/mapper/CodeDetailMapper.java +++ b/src/main/java/com/soft/line/mapper/CodeDetailMapper.java @@ -3,6 +3,7 @@ package com.soft.line.mapper; import com.soft.line.entity.CodeDetail; import java.util.List; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; public interface CodeDetailMapper { /** @@ -21,6 +22,8 @@ public interface CodeDetailMapper { */ CodeDetail selectByPrimaryKey(@Param("codeType") String codeType, @Param("codeDetail") String codeDetail); + String selectContent1ByPrimaryKey(@Param("codeType") String codeType, @Param("codeDetail") String codeDetail); + /** * This method was generated by MyBatis Generator. * This method corresponds to the database table code_detail @@ -28,4 +31,6 @@ public interface CodeDetailMapper { * @mbggenerated */ List selectAll(); + + List selectByCodeType(@Param("codeType") String codeType); } \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/CodeDetailMapper.xml b/src/main/java/com/soft/line/mapper/CodeDetailMapper.xml index 40cf5f5..a04839f 100644 --- a/src/main/java/com/soft/line/mapper/CodeDetailMapper.xml +++ b/src/main/java/com/soft/line/mapper/CodeDetailMapper.xml @@ -1,50 +1,51 @@ - - - - + + + + - - - - - - - - + + + + + + + + - - - insert into `code_detail` (`code_type`, `code_detail`, `code_content1`, - `code_content2`, `code_content3`, `code_content4`, + + insert into `code_detail` (`code_type`, `code_detail`, `code_content1`, + `code_content2`, `code_content3`, `code_content4`, `orderby`, `note`) - values (#{codeType,jdbcType=VARCHAR}, #{codeDetail,jdbcType=VARCHAR}, #{codeContent1,jdbcType=VARCHAR}, - #{codeContent2,jdbcType=VARCHAR}, #{codeContent3,jdbcType=VARCHAR}, #{codeContent4,jdbcType=VARCHAR}, + values (#{codeType,jdbcType=VARCHAR}, #{codeDetail,jdbcType=VARCHAR}, #{codeContent1,jdbcType=VARCHAR}, + #{codeContent2,jdbcType=VARCHAR}, #{codeContent3,jdbcType=VARCHAR}, #{codeContent4,jdbcType=VARCHAR}, #{orderby,jdbcType=INTEGER}, #{note,jdbcType=VARCHAR}) - + select `code_type`, `code_detail`, `code_content1`, `code_content2`, `code_content3`, `code_content4`, `orderby`, `note` from `code_detail` where `code_type` = #{codeType,jdbcType=VARCHAR} and `code_detail` = #{codeDetail,jdbcType=VARCHAR} - + select code_content1 from code_detail where code_type =#{codeType} and code_detail = #{codeDetail} + + + + + + \ No newline at end of file -- Gitee From f10f9c97d533b432ebb9ccc0ce5d830788cce27b Mon Sep 17 00:00:00 2001 From: ljc Date: Thu, 28 May 2020 14:46:43 +0800 Subject: [PATCH 058/211] roleInfo --- .../line/controller/RoleInfoController.java | 20 +++++++- .../java/com/soft/line/entity/RoleInfo.java | 47 ++----------------- .../service/impl/RoleInfoServiceImpl.java | 15 ++++++ 3 files changed, 37 insertions(+), 45 deletions(-) create mode 100644 src/main/java/com/soft/line/service/impl/RoleInfoServiceImpl.java diff --git a/src/main/java/com/soft/line/controller/RoleInfoController.java b/src/main/java/com/soft/line/controller/RoleInfoController.java index fa30288..83e6f31 100644 --- a/src/main/java/com/soft/line/controller/RoleInfoController.java +++ b/src/main/java/com/soft/line/controller/RoleInfoController.java @@ -1,15 +1,33 @@ package com.soft.line.controller; +import com.github.pagehelper.PageInfo; +import com.soft.line.entity.RoleInfo; +import com.soft.line.service.RoleInfoService; +import com.soft.line.util.exception.CommonResult; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -@Api(description = "菜单接口") +import java.util.Map; + +@Api(description = "角色接口") @Slf4j @RestController @RequestMapping("/systemAdmin") public class RoleInfoController { + @Autowired + private RoleInfoService roleInfoService; + + @PostMapping("/roles") + @ApiOperation(value = "获取所有角色列表") + public CommonResult> getAllMenus(@RequestBody Map map) { + return CommonResult.success(roleInfoService.selectAll(map)); + } } diff --git a/src/main/java/com/soft/line/entity/RoleInfo.java b/src/main/java/com/soft/line/entity/RoleInfo.java index 1f6a125..7bb130f 100644 --- a/src/main/java/com/soft/line/entity/RoleInfo.java +++ b/src/main/java/com/soft/line/entity/RoleInfo.java @@ -1,66 +1,25 @@ package com.soft.line.entity; public class RoleInfo { - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column role_info.id - * - * @mbggenerated - */ + private Integer id; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column role_info.name - * - * @mbggenerated - */ private String name; - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column role_info.id - * - * @return the value of role_info.id - * - * @mbggenerated - */ + + public Integer getId() { return id; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column role_info.id - * - * @param id the value for role_info.id - * - * @mbggenerated - */ public void setId(Integer id) { this.id = id; } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column role_info.name - * - * @return the value of role_info.name - * - * @mbggenerated - */ public String getName() { return name; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column role_info.name - * - * @param name the value for role_info.name - * - * @mbggenerated - */ public void setName(String name) { this.name = name == null ? null : name.trim(); } diff --git a/src/main/java/com/soft/line/service/impl/RoleInfoServiceImpl.java b/src/main/java/com/soft/line/service/impl/RoleInfoServiceImpl.java new file mode 100644 index 0000000..6756da3 --- /dev/null +++ b/src/main/java/com/soft/line/service/impl/RoleInfoServiceImpl.java @@ -0,0 +1,15 @@ +package com.soft.line.service.impl; + +import com.github.pagehelper.PageInfo; +import com.soft.line.entity.RoleInfo; +import com.soft.line.service.RoleInfoService; + +import java.util.Map; + +public class RoleInfoServiceImpl implements RoleInfoService { + + @Override + public PageInfo selectAll(Map map) { + return null; + } +} -- Gitee From a54fcf08793e079c33423569f372434cac1b5351 Mon Sep 17 00:00:00 2001 From: ljc Date: Thu, 28 May 2020 16:09:38 +0800 Subject: [PATCH 059/211] =?UTF-8?q?menu=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/soft/line/controller/RoleInfoController.java | 4 ++-- .../java/com/soft/line/mapper/MenuButtonInfoMapper.xml | 2 +- src/main/java/com/soft/line/mapper/MenuInfoMapper.xml | 7 ++++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/soft/line/controller/RoleInfoController.java b/src/main/java/com/soft/line/controller/RoleInfoController.java index 83e6f31..cfa05e6 100644 --- a/src/main/java/com/soft/line/controller/RoleInfoController.java +++ b/src/main/java/com/soft/line/controller/RoleInfoController.java @@ -17,8 +17,8 @@ import java.util.Map; @Api(description = "角色接口") @Slf4j -@RestController -@RequestMapping("/systemAdmin") +//@RestController +//@RequestMapping("/systemAdmin") public class RoleInfoController { @Autowired diff --git a/src/main/java/com/soft/line/mapper/MenuButtonInfoMapper.xml b/src/main/java/com/soft/line/mapper/MenuButtonInfoMapper.xml index 143a687..25a6ca6 100644 --- a/src/main/java/com/soft/line/mapper/MenuButtonInfoMapper.xml +++ b/src/main/java/com/soft/line/mapper/MenuButtonInfoMapper.xml @@ -33,7 +33,7 @@ where `menu_id` = #{menuId} - select button_id from menu_button_info where menu_id= #{menuId} diff --git a/src/main/java/com/soft/line/mapper/MenuInfoMapper.xml b/src/main/java/com/soft/line/mapper/MenuInfoMapper.xml index d0dee4b..eed7b77 100644 --- a/src/main/java/com/soft/line/mapper/MenuInfoMapper.xml +++ b/src/main/java/com/soft/line/mapper/MenuInfoMapper.xml @@ -21,7 +21,7 @@ `menu_url`, `orderby`, `p_id`, `modify_person`, `modify_time`) values (#{menuIcon,jdbcType=VARCHAR}, #{menuName,jdbcType=VARCHAR}, #{state,jdbcType=INTEGER}, - #{menuUrl,jdbcType=VARCHAR}, #{orderby,jdbcType=VARCHAR}, #{pId,jdbcType=INTEGER}, + #{menuUrl,jdbcType=VARCHAR}, #{orderBy,jdbcType=VARCHAR}, #{pId,jdbcType=INTEGER}, #{modifyPerson,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}) @@ -30,7 +30,7 @@ `menu_name` = #{menuName,jdbcType=VARCHAR}, `state` = #{state,jdbcType=INTEGER}, `menu_url` = #{menuUrl,jdbcType=VARCHAR}, - `orderby` = #{orderby,jdbcType=VARCHAR}, + `orderby` = #{orderBy,jdbcType=VARCHAR}, `p_id` = #{pId,jdbcType=INTEGER}, `modify_person` = #{modifyPerson,jdbcType=VARCHAR}, `modify_time` = #{modifyTime,jdbcType=TIMESTAMP} @@ -68,6 +68,7 @@ and menu_url like concat('%', #{menuUrl} ,'%') + order by `orderby` - select menu_name from menu_info -- Gitee From cae5026474a4ee619ca8d9350da0ee52e5c4841c Mon Sep 17 00:00:00 2001 From: ljc Date: Thu, 28 May 2020 16:09:58 +0800 Subject: [PATCH 060/211] =?UTF-8?q?menu=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/soft/line/mapper/MenuButtonInfoMapper.xml | 2 +- src/main/java/com/soft/line/mapper/MenuInfoMapper.xml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/soft/line/mapper/MenuButtonInfoMapper.xml b/src/main/java/com/soft/line/mapper/MenuButtonInfoMapper.xml index 143a687..25a6ca6 100644 --- a/src/main/java/com/soft/line/mapper/MenuButtonInfoMapper.xml +++ b/src/main/java/com/soft/line/mapper/MenuButtonInfoMapper.xml @@ -33,7 +33,7 @@ where `menu_id` = #{menuId} - select button_id from menu_button_info where menu_id= #{menuId} diff --git a/src/main/java/com/soft/line/mapper/MenuInfoMapper.xml b/src/main/java/com/soft/line/mapper/MenuInfoMapper.xml index d0dee4b..76c4a75 100644 --- a/src/main/java/com/soft/line/mapper/MenuInfoMapper.xml +++ b/src/main/java/com/soft/line/mapper/MenuInfoMapper.xml @@ -21,7 +21,7 @@ `menu_url`, `orderby`, `p_id`, `modify_person`, `modify_time`) values (#{menuIcon,jdbcType=VARCHAR}, #{menuName,jdbcType=VARCHAR}, #{state,jdbcType=INTEGER}, - #{menuUrl,jdbcType=VARCHAR}, #{orderby,jdbcType=VARCHAR}, #{pId,jdbcType=INTEGER}, + #{menuUrl,jdbcType=VARCHAR}, #{orderBy,jdbcType=VARCHAR}, #{pId,jdbcType=INTEGER}, #{modifyPerson,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}) @@ -30,7 +30,7 @@ `menu_name` = #{menuName,jdbcType=VARCHAR}, `state` = #{state,jdbcType=INTEGER}, `menu_url` = #{menuUrl,jdbcType=VARCHAR}, - `orderby` = #{orderby,jdbcType=VARCHAR}, + `orderby` = #{orderBy,jdbcType=VARCHAR}, `p_id` = #{pId,jdbcType=INTEGER}, `modify_person` = #{modifyPerson,jdbcType=VARCHAR}, `modify_time` = #{modifyTime,jdbcType=TIMESTAMP} @@ -98,7 +98,7 @@ from menu_info where id = #{pid} - select `id`, `menu_icon`, `menu_name`, `state`, `menu_url`, `orderby`, `p_id`, `modify_person`, `modify_time` from `menu_info` where `p_id` = -1 -- Gitee From d44b0c568fc08ceb6473869b32fce70395a7442f Mon Sep 17 00:00:00 2001 From: ljc Date: Thu, 28 May 2020 20:32:54 +0800 Subject: [PATCH 061/211] =?UTF-8?q?menu=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/soft/line/mapper/MenuButtonInfoMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/soft/line/mapper/MenuButtonInfoMapper.xml b/src/main/java/com/soft/line/mapper/MenuButtonInfoMapper.xml index 25a6ca6..143a687 100644 --- a/src/main/java/com/soft/line/mapper/MenuButtonInfoMapper.xml +++ b/src/main/java/com/soft/line/mapper/MenuButtonInfoMapper.xml @@ -33,7 +33,7 @@ where `menu_id` = #{menuId} - select button_id from menu_button_info where menu_id= #{menuId} -- Gitee From 1efe4045797fcbf3a80d3a0740c859e8d9832e39 Mon Sep 17 00:00:00 2001 From: ljc <1119265069@qq.com> Date: Fri, 29 May 2020 22:25:28 +0800 Subject: [PATCH 062/211] RoleService --- .../java/com/soft/line/service/RoleInfoService.java | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 src/main/java/com/soft/line/service/RoleInfoService.java diff --git a/src/main/java/com/soft/line/service/RoleInfoService.java b/src/main/java/com/soft/line/service/RoleInfoService.java new file mode 100644 index 0000000..259b8a7 --- /dev/null +++ b/src/main/java/com/soft/line/service/RoleInfoService.java @@ -0,0 +1,10 @@ +package com.soft.line.service; + +import com.github.pagehelper.PageInfo; +import com.soft.line.entity.RoleInfo; + +import java.util.Map; + +public interface RoleInfoService { + public PageInfo selectAll(Map map); +} -- Gitee From 4214f808a63bdb723b5762adf847c193d1f6d9c9 Mon Sep 17 00:00:00 2001 From: ljc <1119265069@qq.com> Date: Sat, 30 May 2020 22:40:39 +0800 Subject: [PATCH 063/211] =?UTF-8?q?=E8=A7=92=E8=89=B2=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../line/controller/CommonController.java | 26 ++++ .../line/controller/MenuInfoController.java | 19 ++- .../line/controller/RoleInfoController.java | 36 ++++- .../com/soft/line/entity/AttachmentInfo.java | 20 +-- .../java/com/soft/line/entity/RoleMenu.java | 32 ----- .../com/soft/line/entity/RoleMenuInfo.java | 11 ++ .../soft/line/filter/ConfigurationFilter.java | 2 +- .../soft/line/mapper/AttachmentInfoMapper.xml | 10 +- .../soft/line/mapper/ButtonInfoMapper.java | 2 + .../com/soft/line/mapper/ButtonInfoMapper.xml | 16 +++ .../line/mapper/MenuButtonInfoMapper.java | 23 +-- .../soft/line/mapper/MenuButtonInfoMapper.xml | 16 +-- .../com/soft/line/mapper/MenuInfoMapper.java | 6 +- .../com/soft/line/mapper/MenuInfoMapper.xml | 134 +++++++++--------- .../com/soft/line/mapper/RoleInfoMapper.java | 35 ++--- .../com/soft/line/mapper/RoleInfoMapper.xml | 52 ++++--- .../com/soft/line/mapper/RoleMenuMapper.java | 31 ++-- .../com/soft/line/mapper/RoleMenuMapper.xml | 42 +++--- .../soft/line/service/RoleInfoService.java | 22 +++ .../service/impl/MenuInfoServiceImpl.java | 11 +- .../service/impl/RoleInfoServiceImpl.java | 87 +++++++++++- 21 files changed, 381 insertions(+), 252 deletions(-) create mode 100644 src/main/java/com/soft/line/entity/RoleMenuInfo.java create mode 100644 src/main/java/com/soft/line/service/RoleInfoService.java diff --git a/src/main/java/com/soft/line/controller/CommonController.java b/src/main/java/com/soft/line/controller/CommonController.java index eea55d2..e7c4437 100644 --- a/src/main/java/com/soft/line/controller/CommonController.java +++ b/src/main/java/com/soft/line/controller/CommonController.java @@ -1,15 +1,22 @@ package com.soft.line.controller; import com.soft.line.entity.ButtonInfo; +import com.soft.line.entity.CodeDetail; import com.soft.line.entity.MenuInfo; +import com.soft.line.entity.RoleInfo; import com.soft.line.service.ButtonInfoService; +import com.soft.line.service.CodeDetailService; import com.soft.line.service.MenuInfoService; +import com.soft.line.service.RoleInfoService; import com.soft.line.util.exception.CommonResult; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; 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; @@ -21,10 +28,23 @@ import java.util.List; @RequestMapping("/common") public class CommonController { + @Autowired + private CodeDetailService codeDetailService; @Autowired private ButtonInfoService buttonInfoService; @Autowired private MenuInfoService menuInfoService; + @Autowired + private RoleInfoService roleInfoService; + + @ApiOperation(value = "获取枚举值codeDetail") + @ApiImplicitParams({ + @ApiImplicitParam(name = "codeType", value = "codeType", required = true, dataType = "String", paramType = "path") + }) + @GetMapping("codeDetail/{codeType}") + public CommonResult> getCodeDetailByCodeType(@PathVariable("codeType") String codeType) { + return CommonResult.success(codeDetailService.selectByCodeType(codeType)); + } @GetMapping("/buttons") @ApiOperation(value = "获取所有按钮列表") @@ -44,5 +64,11 @@ public class CommonController { return CommonResult.success(menuInfoService.selectSonMenus()); } + @GetMapping("/roleNames") + @ApiOperation(value = "获取所有角色名") + public CommonResult> getAllRoleInfo() { + return CommonResult.success(roleInfoService.selectAll()); + } + } diff --git a/src/main/java/com/soft/line/controller/MenuInfoController.java b/src/main/java/com/soft/line/controller/MenuInfoController.java index 0b5dec5..21ad5ee 100644 --- a/src/main/java/com/soft/line/controller/MenuInfoController.java +++ b/src/main/java/com/soft/line/controller/MenuInfoController.java @@ -59,11 +59,12 @@ public class MenuInfoController { return new ResultData(200,"删除成功",null); } - @ApiOperation(value = "添加菜单") + @ApiOperation(value = "保存菜单") @PostMapping("/menu") - public ResultData addMenu(@RequestBody Map map) { + public ResultData saveMenu(@RequestBody Map map) { MenuInfo menuInfo = new MenuInfo(); - if (map.get("menuName")==null){ + menuInfo.setId((Integer) map.get("id")); + if (map.get("menuName")==null||"".equals((String)map.get("menuName"))){ return new ResultData(200,"菜单名称不能为空",null); }else{ //新增时判断menuName是否重复 @@ -104,12 +105,16 @@ public class MenuInfoController { buttonInfos.add(buttonInfo); } menuInfo.setButtonInfoList(buttonInfos); - menuInfoService.addMenuInfo(menuInfo); - return new ResultData(200,"添加菜单成功",null); + if(menuInfo.getId()!=null){ + menuInfoService.updateMenInfo(menuInfo); + }else{ + menuInfoService.addMenuInfo(menuInfo); + } + return new ResultData(200,"保存菜单成功",null); } - @ApiOperation(value = "修改菜单") + /*@ApiOperation(value = "修改菜单") @PutMapping("/menu") public ResultData editMenu(@RequestBody Map map) { MenuInfo menuInfo = new MenuInfo(); @@ -157,6 +162,6 @@ public class MenuInfoController { menuInfo.setButtonInfoList(buttonInfos); menuInfoService.updateMenInfo(menuInfo); return new ResultData(200,"修改菜单成功",null); - } + }*/ } diff --git a/src/main/java/com/soft/line/controller/RoleInfoController.java b/src/main/java/com/soft/line/controller/RoleInfoController.java index 83e6f31..9a0b17b 100644 --- a/src/main/java/com/soft/line/controller/RoleInfoController.java +++ b/src/main/java/com/soft/line/controller/RoleInfoController.java @@ -2,17 +2,17 @@ package com.soft.line.controller; import com.github.pagehelper.PageInfo; import com.soft.line.entity.RoleInfo; +import com.soft.line.entity.RoleMenuInfo; import com.soft.line.service.RoleInfoService; import com.soft.line.util.exception.CommonResult; +import com.soft.line.util.exception.ResultData; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; +import java.util.List; import java.util.Map; @Api(description = "角色接口") @@ -26,8 +26,32 @@ public class RoleInfoController { @PostMapping("/roles") @ApiOperation(value = "获取所有角色列表") - public CommonResult> getAllMenus(@RequestBody Map map) { - return CommonResult.success(roleInfoService.selectAll(map)); + public CommonResult>> getAllMenus(@RequestBody Map map) { + return CommonResult.success(roleInfoService.selectAllRoleMenuInfo(map)); } + @DeleteMapping("/role") + @ApiOperation(value = "删除角色") + public ResultData deleteRole(@RequestBody Map map) { + roleInfoService.delete(map); + return new ResultData(200,"删除成功",null); + } + + @PostMapping("/role") + @ApiOperation(value = "保存角色") + public ResultData saveRole(@RequestBody Map map) { + if ((String)map.get("roleName")==null||"".equals((String)map.get("roleName"))){ + return new ResultData(200,"角色名称不能为空",null); + }else if(roleInfoService.countRoleName((Integer)map.get("id"),(String)map.get("roleName")) > 0){ + return new ResultData(200,"角色名称已存在",null); + } + if ((Integer)map.get("id")==null){ + //添加 + roleInfoService.add(map); + }else{ + //修改 + roleInfoService.update(map); + } + return new ResultData(200,"保存成功",null); + } } diff --git a/src/main/java/com/soft/line/entity/AttachmentInfo.java b/src/main/java/com/soft/line/entity/AttachmentInfo.java index 3906085..8147be7 100644 --- a/src/main/java/com/soft/line/entity/AttachmentInfo.java +++ b/src/main/java/com/soft/line/entity/AttachmentInfo.java @@ -21,11 +21,11 @@ public class AttachmentInfo { /** * This field was generated by MyBatis Generator. - * This field corresponds to the database column attachment_info.attachement_url + * This field corresponds to the database column attachment_info.attachment_url * * @mbggenerated */ - private String attachementUrl; + private String attachmentUrl; /** * This field was generated by MyBatis Generator. @@ -93,26 +93,26 @@ public class AttachmentInfo { /** * This method was generated by MyBatis Generator. - * This method returns the value of the database column attachment_info.attachement_url + * This method returns the value of the database column attachment_info.attachment_url * - * @return the value of attachment_info.attachement_url + * @return the value of attachment_info.attachment_url * * @mbggenerated */ - public String getAttachementUrl() { - return attachementUrl; + public String getattachmentUrl() { + return attachmentUrl; } /** * This method was generated by MyBatis Generator. - * This method sets the value of the database column attachment_info.attachement_url + * This method sets the value of the database column attachment_info.attachment_url * - * @param attachementUrl the value for attachment_info.attachement_url + * @param attachmentUrl the value for attachment_info.attachment_url * * @mbggenerated */ - public void setAttachementUrl(String attachementUrl) { - this.attachementUrl = attachementUrl == null ? null : attachementUrl.trim(); + public void setattachmentUrl(String attachmentUrl) { + this.attachmentUrl = attachmentUrl == null ? null : attachmentUrl.trim(); } /** diff --git a/src/main/java/com/soft/line/entity/RoleMenu.java b/src/main/java/com/soft/line/entity/RoleMenu.java index 70bfc1f..a5df72c 100644 --- a/src/main/java/com/soft/line/entity/RoleMenu.java +++ b/src/main/java/com/soft/line/entity/RoleMenu.java @@ -27,14 +27,6 @@ public class RoleMenu { */ private Integer menuButtonId; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column role_menu.view_flg - * - * @mbggenerated - */ - private String viewFlg; - /** * This field was generated by MyBatis Generator. * This field corresponds to the database column role_menu.modify_person @@ -123,30 +115,6 @@ public class RoleMenu { this.menuButtonId = menuButtonId; } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column role_menu.view_flg - * - * @return the value of role_menu.view_flg - * - * @mbggenerated - */ - public String getViewFlg() { - return viewFlg; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column role_menu.view_flg - * - * @param viewFlg the value for role_menu.view_flg - * - * @mbggenerated - */ - public void setViewFlg(String viewFlg) { - this.viewFlg = viewFlg == null ? null : viewFlg.trim(); - } - /** * This method was generated by MyBatis Generator. * This method returns the value of the database column role_menu.modify_person diff --git a/src/main/java/com/soft/line/entity/RoleMenuInfo.java b/src/main/java/com/soft/line/entity/RoleMenuInfo.java new file mode 100644 index 0000000..62f913f --- /dev/null +++ b/src/main/java/com/soft/line/entity/RoleMenuInfo.java @@ -0,0 +1,11 @@ +package com.soft.line.entity; + +import lombok.Data; + +import java.util.List; + +@Data +public class RoleMenuInfo { + public RoleInfo roleInfo; + public List menuInfoList; +} diff --git a/src/main/java/com/soft/line/filter/ConfigurationFilter.java b/src/main/java/com/soft/line/filter/ConfigurationFilter.java index c0e176e..2a9ed32 100644 --- a/src/main/java/com/soft/line/filter/ConfigurationFilter.java +++ b/src/main/java/com/soft/line/filter/ConfigurationFilter.java @@ -66,7 +66,7 @@ public class ConfigurationFilter { final String uri = request.getRequestURI(); String auth = request.getHeader("Access-Token"); Token token = null; - if (!uri.contains("/login")) { + if (!uri.contains("/")) { if (auth == null || "".equals(auth)) { if (uri.contains("/file/download/")) { auth = request.getParameter("token"); diff --git a/src/main/java/com/soft/line/mapper/AttachmentInfoMapper.xml b/src/main/java/com/soft/line/mapper/AttachmentInfoMapper.xml index 99f884c..5b1c01a 100644 --- a/src/main/java/com/soft/line/mapper/AttachmentInfoMapper.xml +++ b/src/main/java/com/soft/line/mapper/AttachmentInfoMapper.xml @@ -8,7 +8,7 @@ --> - + @@ -17,9 +17,9 @@ WARNING - @mbggenerated This element is automatically generated by MyBatis Generator, do not modify. --> - insert into `attachment_info` (`attachment_name`, `attachement_url`, `modify_person`, + insert into `attachment_info` (`attachment_name`, `attachment_url`, `modify_person`, `modify_time`) - values (#{attachmentName,jdbcType=VARCHAR}, #{attachementUrl,jdbcType=VARCHAR}, #{modifyPerson,jdbcType=VARCHAR}, + values (#{attachmentName,jdbcType=VARCHAR}, #{attachmentUrl,jdbcType=VARCHAR}, #{modifyPerson,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}) @@ -36,7 +36,7 @@ WARNING - @mbggenerated This element is automatically generated by MyBatis Generator, do not modify. --> - select `id`, `attachment_name`, `attachement_url`, `modify_person`, `modify_time` + select `id`, `attachment_name`, `attachment_url`, `modify_person`, `modify_time` from `attachment_info` \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/ButtonInfoMapper.java b/src/main/java/com/soft/line/mapper/ButtonInfoMapper.java index 0362247..6603089 100644 --- a/src/main/java/com/soft/line/mapper/ButtonInfoMapper.java +++ b/src/main/java/com/soft/line/mapper/ButtonInfoMapper.java @@ -15,4 +15,6 @@ public interface ButtonInfoMapper { List selectButtonsByMenuId(Integer menuId); ButtonInfo selectByButtonId(String buttonId); + + List selectButtonsByRoleIdAndMenuId(@Param("roleId") Integer roleId,@Param("menuId") Integer menuId); } \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/ButtonInfoMapper.xml b/src/main/java/com/soft/line/mapper/ButtonInfoMapper.xml index 3e3e282..3094b8c 100644 --- a/src/main/java/com/soft/line/mapper/ButtonInfoMapper.xml +++ b/src/main/java/com/soft/line/mapper/ButtonInfoMapper.xml @@ -25,4 +25,20 @@ where `code_type` = '4' and code_detail = #{buttonId,jdbcType=VARCHAR} + + \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/MenuButtonInfoMapper.java b/src/main/java/com/soft/line/mapper/MenuButtonInfoMapper.java index b1c4edb..84035bd 100644 --- a/src/main/java/com/soft/line/mapper/MenuButtonInfoMapper.java +++ b/src/main/java/com/soft/line/mapper/MenuButtonInfoMapper.java @@ -10,32 +10,15 @@ import java.util.List; @Mapper public interface MenuButtonInfoMapper { - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table menu_button_info - * - * @mbggenerated - */ + int insert(MenuButtonInfo record); - int delete(@Param("menuId") int menuId,@Param("buttonId") String buttonId); + int deleteByMenuIdAndButtonId(@Param("menuId") int menuId,@Param("buttonId") String buttonId); - int deleteRoleMenu(@Param("menuId") int menuId,@Param("buttonId") String buttonId); + int deleteByMenuId(@Param("menuId") int menuId); - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table menu_button_info - * - * @mbggenerated - */ MenuButtonInfo selectByPrimaryKey(Integer id); - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table menu_button_info - * - * @mbggenerated - */ List selectAll(); List selectButtonIdByMenuId(Integer menuId); diff --git a/src/main/java/com/soft/line/mapper/MenuButtonInfoMapper.xml b/src/main/java/com/soft/line/mapper/MenuButtonInfoMapper.xml index 143a687..0a00292 100644 --- a/src/main/java/com/soft/line/mapper/MenuButtonInfoMapper.xml +++ b/src/main/java/com/soft/line/mapper/MenuButtonInfoMapper.xml @@ -22,27 +22,21 @@ - - - select button_id from menu_button_info where menu_id= #{menuId} - + delete from menu_button_info where menu_id=#{menuId} and button_id=#{buttonId} - - delete from role_menu where menu_button_id = (select mbi.id from menu_button_info mbi where mbi.menu_id=#{menuId} and mbi.button_id=#{buttonId}) + + delete from menu_button_info where menu_id =(select mi.id from menu_info mi where mi.id=#{menuId}) + \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/MenuInfoMapper.java b/src/main/java/com/soft/line/mapper/MenuInfoMapper.java index d373720..9ef13a0 100644 --- a/src/main/java/com/soft/line/mapper/MenuInfoMapper.java +++ b/src/main/java/com/soft/line/mapper/MenuInfoMapper.java @@ -21,10 +21,6 @@ public interface MenuInfoMapper { int delete(Integer id); - int deleteMenuButtonInfo(Integer menuId); - - int deleteRoleMenu(Integer menuId); - MenuInfo selectByPrimaryKey(Integer id); //获取该菜单的父级菜单 @@ -45,6 +41,8 @@ public interface MenuInfoMapper { //查询menu_button_info中的menu List selectMenusInMenuButton(); + //查询role_menu中的menu_info + List selectByRoleId(@Param("roleId") Integer roleId); } \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/MenuInfoMapper.xml b/src/main/java/com/soft/line/mapper/MenuInfoMapper.xml index 76c4a75..cc763d0 100644 --- a/src/main/java/com/soft/line/mapper/MenuInfoMapper.xml +++ b/src/main/java/com/soft/line/mapper/MenuInfoMapper.xml @@ -1,60 +1,52 @@ - - + + - - - - - - - - - + + + + + + + + + - - insert into `menu_info` (`menu_icon`, `menu_name`, `state`, - `menu_url`, `orderby`, `p_id`, - `modify_person`, `modify_time`) - values (#{menuIcon,jdbcType=VARCHAR}, #{menuName,jdbcType=VARCHAR}, #{state,jdbcType=INTEGER}, - #{menuUrl,jdbcType=VARCHAR}, #{orderBy,jdbcType=VARCHAR}, #{pId,jdbcType=INTEGER}, - #{modifyPerson,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}) - + + insert into `menu_info` (`menu_icon`, `menu_name`, `state`, + `menu_url`, `orderby`, `p_id`, + `modify_person`, `modify_time`) + values (#{menuIcon,jdbcType=VARCHAR}, #{menuName,jdbcType=VARCHAR}, #{state,jdbcType=INTEGER}, + #{menuUrl,jdbcType=VARCHAR}, #{orderBy,jdbcType=VARCHAR}, #{pId,jdbcType=INTEGER}, + #{modifyPerson,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}) + - - update `menu_info` set `menu_icon` = #{menuIcon,jdbcType=VARCHAR} , - `menu_name` = #{menuName,jdbcType=VARCHAR}, - `state` = #{state,jdbcType=INTEGER}, - `menu_url` = #{menuUrl,jdbcType=VARCHAR}, - `orderby` = #{orderBy,jdbcType=VARCHAR}, - `p_id` = #{pId,jdbcType=INTEGER}, - `modify_person` = #{modifyPerson,jdbcType=VARCHAR}, - `modify_time` = #{modifyTime,jdbcType=TIMESTAMP} - where `id` = #{id,jdbcType=INTEGER} - + + update `menu_info` set `menu_icon` = #{menuIcon,jdbcType=VARCHAR} , + `menu_name` = #{menuName,jdbcType=VARCHAR}, + `state` = #{state,jdbcType=INTEGER}, + `menu_url` = #{menuUrl,jdbcType=VARCHAR}, + `orderby` = #{orderBy,jdbcType=VARCHAR}, + `p_id` = #{pId,jdbcType=INTEGER}, + `modify_person` = #{modifyPerson,jdbcType=VARCHAR}, + `modify_time` = #{modifyTime,jdbcType=TIMESTAMP} + where `id` = #{id,jdbcType=INTEGER} + - delete from menu_info where id = #{id} - + delete from menu_info where id = #{id} + - - delete from menu_button_info where menu_id =(select mi.id from menu_info mi where mi.id=#{menuId}) - - - - delete from role_menu where menu_button_id = (select mbi.id from menu_button_info mbi where mbi.menu_id =(select mi.id from menu_info mi where mi.id=#{menuId})) - - - + - select count(*) from `menu_info` where menu_name = #{menuName} @@ -79,7 +71,7 @@ - select count(*) from `menu_info` where `orderby` = #{ory} @@ -88,25 +80,35 @@ - + + select `id`, `menu_icon`, `menu_name`, `state`, `menu_url`, `orderby`, `p_id`, `modify_person`, + `modify_time` + from menu_info where id = #{pid} + - + + select `id`, `menu_icon`, `menu_name`, `state`, `menu_url`, `orderby`, `p_id`, `modify_person`, + `modify_time` + from `menu_info` where `id` in (select mbi.menu_id from menu_button_info mbi ) + + + \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/RoleInfoMapper.java b/src/main/java/com/soft/line/mapper/RoleInfoMapper.java index 04e5596..3138b7c 100644 --- a/src/main/java/com/soft/line/mapper/RoleInfoMapper.java +++ b/src/main/java/com/soft/line/mapper/RoleInfoMapper.java @@ -1,30 +1,23 @@ package com.soft.line.mapper; import com.soft.line.entity.RoleInfo; +import org.apache.ibatis.annotations.Param; + import java.util.List; public interface RoleInfoMapper { - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table role_info - * - * @mbggenerated - */ - int insert(RoleInfo record); - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table role_info - * - * @mbggenerated - */ + + int insert(String roleName); + + int update(@Param("roleId") Integer roleId,@Param("roleName") String roleName); + RoleInfo selectByPrimaryKey(Integer id); - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table role_info - * - * @mbggenerated - */ - List selectAll(); + List selectAll(String roleName); + + int delete(@Param("roleId") Integer roleId); + + int countRoleName(@Param("id") Integer id,@Param("roleName") String roleName); + + RoleInfo selectByRoleName(String roleName); } \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/RoleInfoMapper.xml b/src/main/java/com/soft/line/mapper/RoleInfoMapper.xml index 489069c..9421ca3 100644 --- a/src/main/java/com/soft/line/mapper/RoleInfoMapper.xml +++ b/src/main/java/com/soft/line/mapper/RoleInfoMapper.xml @@ -2,36 +2,50 @@ - - - + + insert into `role_info` (`name`) - values (#{name,jdbcType=VARCHAR}) + values (#{roleName}) + + + update `role_info` set `name` = #{roleName} + where `id` = #{roleId} + + - select `id`, `name` from `role_info` + + + name like concat('%', #{roleName} ,'%') + + + + + + delete from role_info where id = #{roleId} + + + + + \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/RoleMenuMapper.java b/src/main/java/com/soft/line/mapper/RoleMenuMapper.java index 60dd180..89326e9 100644 --- a/src/main/java/com/soft/line/mapper/RoleMenuMapper.java +++ b/src/main/java/com/soft/line/mapper/RoleMenuMapper.java @@ -1,30 +1,21 @@ package com.soft.line.mapper; import com.soft.line.entity.RoleMenu; +import org.apache.ibatis.annotations.Param; + import java.util.List; public interface RoleMenuMapper { - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table role_menu - * - * @mbggenerated - */ - int insert(RoleMenu record); - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table role_menu - * - * @mbggenerated - */ + + int insert(@Param("roleId")Integer roleId,@Param("menuId") Integer menuId,@Param("buttonId") String buttonId,@Param("modifyPerson") String modifyPerson); + RoleMenu selectByPrimaryKey(Integer id); - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table role_menu - * - * @mbggenerated - */ List selectAll(); + + int deleteByRoleId(Integer roleId); + + int deleteByMenuId(Integer menuId); + + int deleteByMenuIdAndButtonId(@Param("menuId") int menuId, @Param("buttonId") String buttonId); } \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/RoleMenuMapper.xml b/src/main/java/com/soft/line/mapper/RoleMenuMapper.xml index 39a72f3..128d206 100644 --- a/src/main/java/com/soft/line/mapper/RoleMenuMapper.xml +++ b/src/main/java/com/soft/line/mapper/RoleMenuMapper.xml @@ -2,42 +2,36 @@ - - - - - insert into `role_menu` (`role_id`, `menu_button_id`, `view_flg`, - `modify_person`, `modify_time`) - values (#{roleId,jdbcType=INTEGER}, #{menuButtonId,jdbcType=INTEGER}, #{viewFlg,jdbcType=CHAR}, - #{modifyPerson,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}) + + insert into `role_menu` (`role_id`, `menu_button_id`, `modify_person`) + select #{roleId}, mbi.id ,#{modifyPerson} from menu_button_info mbi + where mbi.menu_id = #{menuId} and mbi.button_id = #{buttonId} + + + delete from role_menu where role_id = #{roleId} + + + + delete from role_menu where menu_button_id = (select mbi.id from menu_button_info mbi where mbi.menu_id =(select mi.id from menu_info mi where mi.id=#{menuId})) + + + + delete from role_menu where menu_button_id = (select mbi.id from menu_button_info mbi where mbi.menu_id=#{menuId} and mbi.button_id=#{buttonId}) + \ No newline at end of file diff --git a/src/main/java/com/soft/line/service/RoleInfoService.java b/src/main/java/com/soft/line/service/RoleInfoService.java new file mode 100644 index 0000000..8d0fa97 --- /dev/null +++ b/src/main/java/com/soft/line/service/RoleInfoService.java @@ -0,0 +1,22 @@ +package com.soft.line.service; + +import com.github.pagehelper.PageInfo; +import com.soft.line.entity.RoleInfo; +import com.soft.line.entity.RoleMenuInfo; + +import java.util.List; +import java.util.Map; + +public interface RoleInfoService { + List selectAll(); + + PageInfo> selectAllRoleMenuInfo(final Map map); + + void delete(final Map map); + + void add(final Map map); + + void update(final Map map); + + int countRoleName(Integer roleId,String roleName); +} diff --git a/src/main/java/com/soft/line/service/impl/MenuInfoServiceImpl.java b/src/main/java/com/soft/line/service/impl/MenuInfoServiceImpl.java index aad319c..fc14953 100644 --- a/src/main/java/com/soft/line/service/impl/MenuInfoServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/MenuInfoServiceImpl.java @@ -7,6 +7,7 @@ import com.soft.line.entity.MenuInfo; import com.soft.line.mapper.ButtonInfoMapper; import com.soft.line.mapper.MenuButtonInfoMapper; import com.soft.line.mapper.MenuInfoMapper; +import com.soft.line.mapper.RoleMenuMapper; import com.soft.line.service.MenuInfoService; import com.soft.line.util.pagehelper.PageUtil; import lombok.extern.slf4j.Slf4j; @@ -29,6 +30,8 @@ public class MenuInfoServiceImpl implements MenuInfoService { private ButtonInfoMapper buttonInfoMapper; @Autowired private MenuButtonInfoMapper menuButtonInfoMapper; + @Autowired + private RoleMenuMapper roleMenuMapper; @Override public PageInfo selectAll(final Map map) { @@ -98,8 +101,8 @@ public class MenuInfoServiceImpl implements MenuInfoService { //旧的比新的多，删除旧的 List dealOldButtonList = getDiffrent(oldButtonList,newButtonList); for (String buttonId : dealOldButtonList) { - menuButtonInfoMapper.deleteRoleMenu(menuInfo.getId(),buttonId); - menuButtonInfoMapper.delete(menuInfo.getId(),buttonId); + roleMenuMapper.deleteByMenuIdAndButtonId(menuInfo.getId(),buttonId); + menuButtonInfoMapper.deleteByMenuIdAndButtonId(menuInfo.getId(),buttonId); } //新的比旧的多，新增新的 List dealNewButtonList = getDiffrent(newButtonList,oldButtonList); @@ -116,8 +119,8 @@ public class MenuInfoServiceImpl implements MenuInfoService { @Override @Transactional public void delete(Integer id) { - menuInfoMapper.deleteRoleMenu(id); - menuInfoMapper.deleteMenuButtonInfo(id); + roleMenuMapper.deleteByMenuId(id); + menuButtonInfoMapper.deleteByMenuId(id); menuInfoMapper.delete(id); } diff --git a/src/main/java/com/soft/line/service/impl/RoleInfoServiceImpl.java b/src/main/java/com/soft/line/service/impl/RoleInfoServiceImpl.java index 6756da3..faf5524 100644 --- a/src/main/java/com/soft/line/service/impl/RoleInfoServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/RoleInfoServiceImpl.java @@ -1,15 +1,98 @@ package com.soft.line.service.impl; import com.github.pagehelper.PageInfo; +import com.soft.line.entity.MenuInfo; import com.soft.line.entity.RoleInfo; +import com.soft.line.entity.RoleMenuInfo; +import com.soft.line.mapper.ButtonInfoMapper; +import com.soft.line.mapper.MenuInfoMapper; +import com.soft.line.mapper.RoleInfoMapper; +import com.soft.line.mapper.RoleMenuMapper; import com.soft.line.service.RoleInfoService; +import com.soft.line.util.pagehelper.PageUtil; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.List; import java.util.Map; +@Slf4j +@Service public class RoleInfoServiceImpl implements RoleInfoService { + @Autowired + private RoleInfoMapper roleInfoMapper; + @Autowired + private MenuInfoMapper menuInfoMapper; + @Autowired + private ButtonInfoMapper buttonInfoMapper; + @Autowired + private RoleMenuMapper roleMenuMapper; + + @Override + public List selectAll() { + return roleInfoMapper.selectAll(null); + } + + @Override + public PageInfo> selectAllRoleMenuInfo(final Map map){ + PageUtil.setPageParam(map); + List roleMenuInfos= new ArrayList(); + for (RoleInfo roleInfo:roleInfoMapper.selectAll((String)map.get("roleName"))){ + RoleMenuInfo rmi = new RoleMenuInfo(); + rmi.setRoleInfo(roleInfo); + List menuInfos = menuInfoMapper.selectByRoleId(roleInfo.getId()); + for (MenuInfo menuInfo:menuInfos){ + menuInfo.setButtonInfoList(buttonInfoMapper.selectButtonsByRoleIdAndMenuId(roleInfo.getId(),menuInfo.getId())); + } + rmi.setMenuInfoList(menuInfos); + roleMenuInfos.add(rmi); + } + PageInfo> roleMenuInfoPage=new PageInfo(roleMenuInfos); + return roleMenuInfoPage; + } + + @Override + public void delete(Map map) { + Integer roleId =(Integer)map.get("id"); + roleMenuMapper.deleteByRoleId(roleId); + roleInfoMapper.delete(roleId); + } + + @Override + public int countRoleName(Integer roleId, String roleName) { + return roleInfoMapper.countRoleName(roleId,roleName); + } + + @Override + public void add(Map map) { + String roleName = (String)map.get("roleName"); + String modifyPerson = "admin"; + roleInfoMapper.insert(roleName); + RoleInfo roleInfo = roleInfoMapper.selectByRoleName(roleName); + List> menuList=(List)map.get("menu"); + for (Map mp:menuList){ + Integer menuId=(Integer)mp.get("menuId"); + for (String buttonId:(List)mp.get("buttonList")){ + roleMenuMapper.insert(roleInfo.getId(),menuId,buttonId,modifyPerson); + } + } + } + @Override - public PageInfo selectAll(Map map) { - return null; + public void update(Map map) { + Integer roleId =(Integer)map.get("id"); + String modifyPerson = "admin"; + roleInfoMapper.update(roleId,(String)map.get("roleName")); + roleMenuMapper.deleteByRoleId(roleId); + List> menuList=(List)map.get("menu"); + for (Map mp:menuList){ + Integer menuId=(Integer)mp.get("menuId"); + for (String buttonId:(List)mp.get("buttonList")){ + roleMenuMapper.insert(roleId,menuId,buttonId,modifyPerson); + } + } } } -- Gitee From 9d8d20f606cd7edae4a26ac5bc37aad3ba0e7574 Mon Sep 17 00:00:00 2001 From: ljc <1119265069@qq.com> Date: Sat, 30 May 2020 22:46:15 +0800 Subject: [PATCH 064/211] =?UTF-8?q?=E8=A7=92=E8=89=B2=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/soft/line/controller/RoleInfoController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/soft/line/controller/RoleInfoController.java b/src/main/java/com/soft/line/controller/RoleInfoController.java index 9089fb9..9a0b17b 100644 --- a/src/main/java/com/soft/line/controller/RoleInfoController.java +++ b/src/main/java/com/soft/line/controller/RoleInfoController.java @@ -17,8 +17,8 @@ import java.util.Map; @Api(description = "角色接口") @Slf4j -//@RestController -//@RequestMapping("/systemAdmin") +@RestController +@RequestMapping("/systemAdmin") public class RoleInfoController { @Autowired -- Gitee From e2e04fe0a95d79e417cf24b5fda5011074f1a1ca Mon Sep 17 00:00:00 2001 From: ljc <1119265069@qq.com> Date: Sun, 31 May 2020 22:13:56 +0800 Subject: [PATCH 065/211] =?UTF-8?q?=E8=AF=81=E4=B9=A6=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 7 ++ .../controller/CertificateInfoController.java | 42 +++++++++- .../com/soft/line/entity/CertificateInfo.java | 6 ++ .../line/mapper/CertificateInfoMapper.java | 34 +++----- .../line/mapper/CertificateInfoMapper.xml | 84 ++++++++++++++----- .../com/soft/line/mapper/CodeDetailMapper.xml | 2 +- .../line/service/CertificateInfoService.java | 12 +++ .../impl/CertificateInfoServiceImpl.java | 38 +++++++++ .../java/com/soft/line/util/poi/PoiUtils.java | 29 +++++++ 9 files changed, 211 insertions(+), 43 deletions(-) create mode 100644 src/main/java/com/soft/line/util/poi/PoiUtils.java diff --git a/pom.xml b/pom.xml index f1c792f..b6dfe50 100644 --- a/pom.xml +++ b/pom.xml @@ -177,6 +177,13 @@ pagehelper-spring-boot-starter 1.2.5 + + + + org.apache.poi + poi + 4.1.2 + diff --git a/src/main/java/com/soft/line/controller/CertificateInfoController.java b/src/main/java/com/soft/line/controller/CertificateInfoController.java index d3e207a..63bcd4d 100644 --- a/src/main/java/com/soft/line/controller/CertificateInfoController.java +++ b/src/main/java/com/soft/line/controller/CertificateInfoController.java @@ -3,6 +3,8 @@ package com.soft.line.controller; import com.soft.line.service.CertificateInfoService; import com.soft.line.util.exception.CommonResult; +import com.soft.line.util.exception.ResultData; +import com.soft.line.util.jackson.converter.StringToDateUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; @@ -11,6 +13,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.Date; import java.util.Map; /** @@ -21,7 +24,7 @@ import java.util.Map; @Api(description = "证书接口") @Slf4j @RestController -@RequestMapping("/certificateInfo") +@RequestMapping("/dataManage") public class CertificateInfoController { @Autowired @@ -48,4 +51,41 @@ public class CertificateInfoController { return CommonResult.success(certificateInfoService.getAllCompanyCertificates(map)); } + @ApiOperation(value = "获取所有证书列表", notes = "获取所有证书列表") + @GetMapping("/certificate") + public CommonResult getAllCertificates(@RequestBody Map map){ + return CommonResult.success(certificateInfoService.getAllCertificates(map)); + } + + @ApiOperation(value = "删除证书", notes = "删除证书") + @DeleteMapping("/certificate") + public ResultData deleteCertificate(@RequestBody Map map){ + certificateInfoService.delete(map); + return new ResultData(200,"删除成功",null); + } + + @ApiOperation(value = "保存证书", notes = "保存证书") + @PostMapping("/certificate") + public ResultData saveCertificate(@RequestBody Map map){ + if (certificateInfoService.countByCName((Integer)map.get("id"),(String)map.get("certType"),(String)map.get("certName"))>0){ + return new ResultData(200,"相同部门存在相同证书名称",null); + }else if(certificateInfoService.countByCName((Integer)map.get("id"),(String)map.get("certType"),(String)map.get("certId"))>0){ + return new ResultData(200,"相同部门存在相同证书编号",null); + } + Date beginDate = StringToDateUtil.convert((String)map.get("beginDate")); + Date endDate =StringToDateUtil.convert((String)map.get("endDate")); + if (beginDate.after(endDate)){ + return new ResultData(200,"起始日期不能>终止日期",null); + } + if ((Integer)map.get("id")==null){ + //添加 + certificateInfoService.add(map); + return new ResultData(200,"添加成功",null); + }else{ + //修改 + certificateInfoService.update(map); + return new ResultData(200,"修改成功",null); + } + } + } diff --git a/src/main/java/com/soft/line/entity/CertificateInfo.java b/src/main/java/com/soft/line/entity/CertificateInfo.java index 217c4cf..8bed301 100644 --- a/src/main/java/com/soft/line/entity/CertificateInfo.java +++ b/src/main/java/com/soft/line/entity/CertificateInfo.java @@ -1,5 +1,6 @@ package com.soft.line.entity; +import javax.validation.constraints.NotNull; import java.util.Date; public class CertificateInfo { @@ -17,6 +18,7 @@ public class CertificateInfo { * * @mbggenerated */ + @NotNull private String certId; /** @@ -25,6 +27,7 @@ public class CertificateInfo { * * @mbggenerated */ + @NotNull private String certType; /** @@ -33,6 +36,7 @@ public class CertificateInfo { * * @mbggenerated */ + @NotNull private String certName; /** @@ -41,6 +45,7 @@ public class CertificateInfo { * * @mbggenerated */ + @NotNull private String certUnit; /** @@ -49,6 +54,7 @@ public class CertificateInfo { * * @mbggenerated */ + @NotNull private Date beginDate; /** diff --git a/src/main/java/com/soft/line/mapper/CertificateInfoMapper.java b/src/main/java/com/soft/line/mapper/CertificateInfoMapper.java index ce1620e..6d35484 100644 --- a/src/main/java/com/soft/line/mapper/CertificateInfoMapper.java +++ b/src/main/java/com/soft/line/mapper/CertificateInfoMapper.java @@ -2,38 +2,30 @@ package com.soft.line.mapper; import com.soft.line.entity.CertificateInfo; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; @Mapper public interface CertificateInfoMapper { - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table certificate_info - * - * @mbggenerated - */ - int insert(CertificateInfo record); - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table certificate_info - * - * @mbggenerated - */ + + int insert(Map map); + + int delete(Map map); + + int update(Map map); + CertificateInfo selectByPrimaryKey(Long id); - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table certificate_info - * - * @mbggenerated - */ - List selectAll(); + List selectAll(Map map); List getPersonalAll(String userName); List getAllCompanyCertificates(Map map); + + int countCertificateByIdAndTypeAndName(@Param("id")Integer id,@Param("certType")String certType,@Param("certName")String certName); + + int countCertificateByIdAndTypeAndCId(@Param("id")Integer id,@Param("certType")String certType,@Param("certId")String certId); } \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/CertificateInfoMapper.xml b/src/main/java/com/soft/line/mapper/CertificateInfoMapper.xml index 6e0cb35..5b4015e 100644 --- a/src/main/java/com/soft/line/mapper/CertificateInfoMapper.xml +++ b/src/main/java/com/soft/line/mapper/CertificateInfoMapper.xml @@ -18,52 +18,96 @@ - - + insert into `certificate_info` (`cert_id`, `cert_type`, `cert_name`, `cert_unit`, `begin_date`, `end_date`, - `note`, `modify_person`, `modify_time`, - `del_flg`) + `note`, `modify_person`) values (#{certId,jdbcType=VARCHAR}, #{certType,jdbcType=VARCHAR}, #{certName,jdbcType=VARCHAR}, #{certUnit,jdbcType=VARCHAR}, #{beginDate,jdbcType=TIMESTAMP}, #{endDate,jdbcType=TIMESTAMP}, - #{note,jdbcType=VARCHAR}, #{modifyPerson,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}, - #{delFlg,jdbcType=CHAR}) + #{note,jdbcType=VARCHAR}, #{modifyPerson,jdbcType=VARCHAR}) + + + update `certificate_info` set `del_flg` = '1' where `id` = #{id,jdbcType=INTEGER} + + + + update `certificate_info` set `cert_id` = #{certId,jdbcType=VARCHAR}, + `cert_type` = #{certType,jdbcType=VARCHAR}, + `cert_name` = #{certName,jdbcType=VARCHAR}, + `cert_unit` = #{certUnit,jdbcType=VARCHAR}, + `begin_date` = #{beginDate,jdbcType=TIMESTAMP}, + `end_Date` = #{endDate,jdbcType=TIMESTAMP}, + `note` = #{note,jdbcType=VARCHAR}, + `modify_person` = #{modifyPerson,jdbcType=VARCHAR}, + `modify_time` = #{modifyTime,jdbcType=VARCHAR} + where `id` = #{id,jdbcType=INTEGER} + + - + select `id`, `cert_id`, `cert_type`, `cert_name`, `cert_unit`, `begin_date`, `end_date`, `note`, `modify_person`, `modify_time`, `del_flg` from `certificate_info` + WHERE `del_flg` = '0' + + and instr(`cert_id`,#{certId,jdbcType=VARCHAR})>0 + + + and instr(`cert_type`,#{certType,jdbcType=VARCHAR})>0 + + + and instr(`cert_name`,#{certName,jdbcType=VARCHAR})>0 + + + and instr(`cert_unit`,#{certUnit,jdbcType=VARCHAR})>0 + + + and `begin_date` >= #{beginDate} + + + and `end_date` >= #{endDate} + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/CodeDetailMapper.xml b/src/main/java/com/soft/line/mapper/CodeDetailMapper.xml index a04839f..28b5b98 100644 --- a/src/main/java/com/soft/line/mapper/CodeDetailMapper.xml +++ b/src/main/java/com/soft/line/mapper/CodeDetailMapper.xml @@ -31,7 +31,7 @@ and `code_detail` = #{codeDetail,jdbcType=VARCHAR} - select code_content1 from code_detail where code_type =#{codeType} and code_detail = #{codeDetail} diff --git a/src/main/java/com/soft/line/service/CertificateInfoService.java b/src/main/java/com/soft/line/service/CertificateInfoService.java index aef943c..16a2b0a 100644 --- a/src/main/java/com/soft/line/service/CertificateInfoService.java +++ b/src/main/java/com/soft/line/service/CertificateInfoService.java @@ -16,4 +16,16 @@ public interface CertificateInfoService { public List getPersonalAll(String userName); public PageInfo getAllCompanyCertificates(final Map map); + + public PageInfo getAllCertificates(final Map map); + + public void delete(final Map map); + + public void add(final Map map); + + public void update(final Map map); + + public int countByCName(Integer id,String cType,String cName); + + public int countByCId(Integer id,String cType,String cId); } diff --git a/src/main/java/com/soft/line/service/impl/CertificateInfoServiceImpl.java b/src/main/java/com/soft/line/service/impl/CertificateInfoServiceImpl.java index 36fa98c..bcebaad 100644 --- a/src/main/java/com/soft/line/service/impl/CertificateInfoServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/CertificateInfoServiceImpl.java @@ -9,6 +9,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.Date; import java.util.List; import java.util.Map; @@ -35,4 +36,41 @@ public class CertificateInfoServiceImpl implements CertificateInfoService { beans.setList(certificateInfos); return beans; } + + @Override + public PageInfo getAllCertificates(Map map) { + PageUtil.setPageParam(map); + List certificateInfos=certificateInfoMapper.selectAll(map); + PageInfo beans = new PageInfo(certificateInfos); + beans.setList(certificateInfos); + return beans; + } + + @Override + public void delete(Map map) { + certificateInfoMapper.delete(map); + } + + @Override + public int countByCName(Integer id, String cType, String cName) { + return certificateInfoMapper.countCertificateByIdAndTypeAndName(id,cType,cName); + } + + @Override + public int countByCId(Integer id, String cType, String cId) { + return certificateInfoMapper.countCertificateByIdAndTypeAndCId(id,cType,cId); + } + + @Override + public void add(Map map) { + map.put("modifyPerson","admin"); + certificateInfoMapper.insert(map); + } + + @Override + public void update(Map map) { + map.put("modifyPerson","admin"); + map.put("modifyTime",new Date()); + certificateInfoMapper.update(map); + } } diff --git a/src/main/java/com/soft/line/util/poi/PoiUtils.java b/src/main/java/com/soft/line/util/poi/PoiUtils.java new file mode 100644 index 0000000..4583713 --- /dev/null +++ b/src/main/java/com/soft/line/util/poi/PoiUtils.java @@ -0,0 +1,29 @@ +package com.soft.line.util.poi; + +import com.soft.line.entity.CertificateInfo; +import com.soft.line.entity.ContractInfo; +import org.springframework.web.multipart.MultipartFile; + +import java.util.ArrayList; +import java.util.List; + +public class PoiUtils { + + public void certificate2Excel(List list){ + + } + + public void contract2Excel(List list){ + + } + + public List excel2Certificate(MultipartFile file){ + List certificateInfoList = new ArrayList(); + return certificateInfoList; + } + + public List excel2ContractInfo(MultipartFile file){ + List contractInfoList = new ArrayList(); + return contractInfoList; + } +} -- Gitee From ea050c700f9418f629ce23904e6ab4943c75a623 Mon Sep 17 00:00:00 2001 From: ljc <1119265069@qq.com> Date: Sun, 31 May 2020 23:35:52 +0800 Subject: [PATCH 066/211] =?UTF-8?q?=E5=90=88=E5=90=8C=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ContractInfoController.java | 65 ++++++++++++- .../soft/line/mapper/ContractInfoMapper.java | 11 ++- .../soft/line/mapper/ContractInfoMapper.xml | 97 +++++++++++++++---- .../line/service/ContractInfoService.java | 9 ++ .../service/impl/ContractInfoServiceImpl.java | 33 +++++++ 5 files changed, 191 insertions(+), 24 deletions(-) diff --git a/src/main/java/com/soft/line/controller/ContractInfoController.java b/src/main/java/com/soft/line/controller/ContractInfoController.java index 482b91e..fad4372 100644 --- a/src/main/java/com/soft/line/controller/ContractInfoController.java +++ b/src/main/java/com/soft/line/controller/ContractInfoController.java @@ -2,12 +2,13 @@ package com.soft.line.controller; import com.soft.line.service.ContractInfoService; import com.soft.line.util.exception.CommonResult; +import com.soft.line.util.exception.ResultData; +import com.soft.line.util.jackson.converter.StringToDateUtil; +import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; +import java.util.Date; import java.util.Map; /** @@ -15,7 +16,7 @@ import java.util.Map; * @author wu.xueqiao on 2020/5/21. * @version 0.1 */ -@RequestMapping("/contract") +@RequestMapping("/dataManage") @RestController public class ContractInfoController { @@ -26,4 +27,58 @@ public class ContractInfoController { public CommonResult getAllAboutContracts(@RequestBody Map map){ return CommonResult.success(contractInfoService.getAllAboutContracts(map)); } + + @ApiOperation(value = "获取所有合同", notes = "获取所有合同") + @GetMapping("/contract") + public CommonResult getAllContracts(@RequestBody Map map){ + return CommonResult.success(contractInfoService.getAllContracts(map)); + } + + @ApiOperation(value = "删除证书", notes = "删除证书") + @DeleteMapping("/certificate") + public ResultData deleteCertificate(@RequestBody Map map){ + contractInfoService.delete(map); + return new ResultData(200,"删除成功",null); + } + + @ApiOperation(value = "保存合同", notes = "保存合同") + @PostMapping("/certificate") + public ResultData saveCertificate(@RequestBody Map map){ + if (contractInfoService.countContractByIdAndDeptAndTypeAndName((Integer)map.get("id"),(String)map.get("depId"), + (String)map.get("proId"),(String)map.get("contractName"))>1){ + return new ResultData(200,"相同部门相同项目类型下存在相同合同名称",null); + } + + if (!isDouble((String)map.get("totalAmount"))){ + return new ResultData(200,"总金额不是数字类型",null); + } + Date signDate = StringToDateUtil.convert((String)map.get("signTime")); + Date beginDate = StringToDateUtil.convert((String)map.get("beginDate")); + Date endDate =StringToDateUtil.convert((String)map.get("endDate")); + if (beginDate.after(endDate)){ + return new ResultData(200,"起始日期不能>终止日期",null); + } + if ((Integer)map.get("id")==null){ + //添加 + contractInfoService.add(map); + return new ResultData(200,"添加成功",null); + }else{ + //修改 + contractInfoService.update(map); + return new ResultData(200,"修改成功",null); + } + } + + public static boolean isDouble(String value) { + try { + Double.parseDouble(value); + if (value.contains(".")) { + return true; + } + return false; + } catch (NumberFormatException e) { + return false; + } + } + } diff --git a/src/main/java/com/soft/line/mapper/ContractInfoMapper.java b/src/main/java/com/soft/line/mapper/ContractInfoMapper.java index 0730b7b..0e565bc 100644 --- a/src/main/java/com/soft/line/mapper/ContractInfoMapper.java +++ b/src/main/java/com/soft/line/mapper/ContractInfoMapper.java @@ -1,6 +1,7 @@ package com.soft.line.mapper; import com.soft.line.entity.ContractInfo; +import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; @@ -12,7 +13,11 @@ public interface ContractInfoMapper { * * @mbggenerated */ - int insert(ContractInfo record); + int insert(Map map); + + int delete(Map map); + + int update(Map map); /** * This method was generated by MyBatis Generator. @@ -28,8 +33,10 @@ public interface ContractInfoMapper { * * @mbggenerated */ - List selectAll(); + List selectAll(Map map); List getAllAboutContracts(Map map); + + int countContractByIdAndDeptAndTypeAndName(@Param("id")Integer id,@Param("depId")String depId,@Param("proId")String proId,@Param("contractName")String contractName); } \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml b/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml index 29abbfa..1537248 100644 --- a/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml +++ b/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml @@ -10,7 +10,7 @@ - + @@ -23,47 +23,99 @@ - - + + insert into `contract_info` (`dep_id`, `contract_name`, `pro_id`, - `total amount`, `part_a`, `part_b`, + `total_amount`, `part_a`, `part_b`, `sign_time`, `sign_addr`, `begin_date`, `end_date`, `payment`, `note`, - `modify_person`, `modify_time`, `del_flg` + `modify_person` ) values (#{depId,jdbcType=VARCHAR}, #{contractName,jdbcType=VARCHAR}, #{proId,jdbcType=VARCHAR}, #{totalAmount,jdbcType=DECIMAL}, #{partA,jdbcType=VARCHAR}, #{partB,jdbcType=VARCHAR}, #{signTime,jdbcType=TIMESTAMP}, #{signAddr,jdbcType=VARCHAR}, #{beginDate,jdbcType=TIMESTAMP}, #{endDate,jdbcType=TIMESTAMP}, #{payment,jdbcType=VARCHAR}, #{note,jdbcType=VARCHAR}, - #{modifyPerson,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}, #{delFlg,jdbcType=CHAR} + #{modifyPerson,jdbcType=VARCHAR} ) + + + update `contract_info` set `del_flg` = '1' where `id` = #{id,jdbcType=INTEGER} + + + + update `contract_info` set `dep_id` = #{depId,jdbcType=VARCHAR}, + `contract_name` = #{contractName,jdbcType=VARCHAR}, + `pro_id` = #{proId,jdbcType=VARCHAR}, + `total_amount` = #{totalAmount,jdbcType=DECIMAL}, + `part_a` = #{partA,jdbcType=VARCHAR}, + `part_b` = #{partB,jdbcType=VARCHAR}, + `sign_time` = #{signTime,jdbcType=TIMESTAMP}, + `sign_addr` = #{signAddr,jdbcType=VARCHAR}, + `begin_date` = #{beginDate,jdbcType=TIMESTAMP}, + `end_date` = #{endDate,jdbcType=TIMESTAMP}, + `payment` = #{payment,jdbcType=VARCHAR}, + `note` = #{note,jdbcType=VARCHAR}, + `modify_person` = #{modifyPerson,jdbcType=VARCHAR}, + `modify_time` = #{modifyTime,jdbcType=TIMESTAMP}, + where `id` = #{id,jdbcType=INTEGER} + + - + select `id`, `dep_id`, `contract_name`, `pro_id`, `total_amount`, `part_a`, `part_b`, `sign_time`, `sign_addr`, `begin_date`, `end_date`, `payment`, `note`, `modify_person`, `modify_time`, `del_flg` from `contract_info` + WHERE `del_flg` = '0' + + AND instr(`dep_id`,#{depId,jdbcType=VARCHAR})>0 + + + AND instr(`contract_name`,#{contractName,jdbcType=VARCHAR})>0 + + + AND instr(`proId`,#{proId,jdbcType=VARCHAR})>0 + + + AND `total_amount` >= {totalAmount,jdbcType=DECIMAL} + + + AND instr(`part_a`,#{partA,jdbcType=VARCHAR})>0 + + + AND instr(`part_b`,#{partB,jdbcType=VARCHAR})>0 + + + AND instr(`sign_time`,#{signTime,jdbcType=TIMESTAMP})>0 + + + AND instr(`sign_addr`,#{signAddr,jdbcType=VARCHAR})>0 + + + AND `begin_date` >= #{beginDate,jdbcType=TIMESTAMP} + + + AND `end_date` >= #{endDate,jdbcType=TIMESTAMP} + + + AND instr(`payment`,#{payment,jdbcType=VARCHAR})>0 + + + + \ No newline at end of file diff --git a/src/main/java/com/soft/line/service/ContractInfoService.java b/src/main/java/com/soft/line/service/ContractInfoService.java index 8500a53..ce10a8f 100644 --- a/src/main/java/com/soft/line/service/ContractInfoService.java +++ b/src/main/java/com/soft/line/service/ContractInfoService.java @@ -16,4 +16,13 @@ public interface ContractInfoService { public PageInfo getAllAboutContracts(Map map); + public PageInfo getAllContracts(Map map); + + public void delete(Map map); + + public void add(Map map); + + public void update(Map map); + + public int countContractByIdAndDeptAndTypeAndName(Integer id,String deptId,String proId,String contractName); } diff --git a/src/main/java/com/soft/line/service/impl/ContractInfoServiceImpl.java b/src/main/java/com/soft/line/service/impl/ContractInfoServiceImpl.java index 23cde55..4cf0816 100644 --- a/src/main/java/com/soft/line/service/impl/ContractInfoServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/ContractInfoServiceImpl.java @@ -9,6 +9,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.Date; import java.util.List; import java.util.Map; @@ -31,4 +32,36 @@ public class ContractInfoServiceImpl implements ContractInfoService{ beans.setList(certificateInfos); return beans; } + + @Override + public PageInfo getAllContracts(Map map) { + PageUtil.setPageParam(map); + List certificateInfos=contractInfoMapper.selectAll(map); + PageInfo beans = new PageInfo(certificateInfos); + beans.setList(certificateInfos); + return beans; + } + + @Override + public void delete(Map map) { + contractInfoMapper.delete(map); + } + + @Override + public void add(Map map) { + map.put("modifyPerson","admin"); + contractInfoMapper.insert(map); + } + + @Override + public void update(Map map) { + map.put("modifyPerson","admin"); + map.put("modifyTime",new Date()); + contractInfoMapper.update(map); + } + + @Override + public int countContractByIdAndDeptAndTypeAndName(Integer id, String deptId, String proId, String contractName) { + return contractInfoMapper.countContractByIdAndDeptAndTypeAndName(id, deptId, proId, contractName); + } } -- Gitee From cb7527653f561acd37d79d534d7cc31ff82d0f04 Mon Sep 17 00:00:00 2001 From: wuxueqiao <17625808004@163.com> Date: Mon, 1 Jun 2020 09:59:28 +0800 Subject: [PATCH 067/211] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=AB=AF?= =?UTF-8?q?=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 6 +- softline-files-manage.iml | 6 +- .../com/soft/line/aop/PermissionAspect.java | 6 +- .../line/controller/MpLoginController.java | 42 ++++ .../com/soft/line/entity/UserInfoToken.java | 12 +- .../com/soft/line/filter/UserTokenDto.java | 39 +-- .../com/soft/line/mapper/UserInfoMapper.java | 6 + .../com/soft/line/mapper/UserInfoMapper.xml | 25 ++ .../com/soft/line/service/LoginService.java | 6 + .../line/service/impl/LoginServiceImpl.java | 130 +++++++++- .../service/impl/UserInfoServiceImpl.java | 2 +- .../com/soft/line/util/MP/AjaxResult.java | 236 ++++++++++++++++++ .../java/com/soft/line/util/MP/DateUtil.java | 103 ++++++++ .../com/soft/line/util/MP/HttpClientUtil.java | 113 +++++++++ .../com/soft/line/util/MP/OpenIdUtil.java | 22 ++ .../com/soft/line/util/MP/SystemConstant.java | 34 +++ 16 files changed, 732 insertions(+), 56 deletions(-) create mode 100644 src/main/java/com/soft/line/controller/MpLoginController.java create mode 100644 src/main/java/com/soft/line/util/MP/AjaxResult.java create mode 100644 src/main/java/com/soft/line/util/MP/DateUtil.java create mode 100644 src/main/java/com/soft/line/util/MP/HttpClientUtil.java create mode 100644 src/main/java/com/soft/line/util/MP/OpenIdUtil.java create mode 100644 src/main/java/com/soft/line/util/MP/SystemConstant.java diff --git a/pom.xml b/pom.xml index b6dfe50..6273194 100644 --- a/pom.xml +++ b/pom.xml @@ -54,7 +54,11 @@ - + + com.alibaba + fastjson + 1.2.4 + org.apache.commons commons-lang3 diff --git a/softline-files-manage.iml b/softline-files-manage.iml index 6d91d73..631323f 100644 --- a/softline-files-manage.iml +++ b/softline-files-manage.iml @@ -90,6 +90,7 @@ + @@ -123,7 +124,6 @@ - @@ -173,5 +173,9 @@ + + + + \ No newline at end of file diff --git a/src/main/java/com/soft/line/aop/PermissionAspect.java b/src/main/java/com/soft/line/aop/PermissionAspect.java index 74183fe..a98457b 100644 --- a/src/main/java/com/soft/line/aop/PermissionAspect.java +++ b/src/main/java/com/soft/line/aop/PermissionAspect.java @@ -50,11 +50,11 @@ public class PermissionAspect { RequestAttributes requestAttributes = RequestContextHolder.getRequestAttributes(); HttpServletResponse response=((ServletRequestAttributes)requestAttributes).getResponse(); Map map=new HashMap<>(); - String userName=userToken.getUserName(); - String password=userToken.getPassword(); + String userName=userToken.getUserInfo().getUserName(); + String password=userToken.getUserInfo().getPassword(); map.put("username",userName); map.put("password",password); - log.info(userToken.getUserName()); + // log.info(userToken.getUserName()); //根据角色,编辑业务逻辑。。。。。 UserInfo userInfo=userInfoMapper.userLogin(map); Object o=null; diff --git a/src/main/java/com/soft/line/controller/MpLoginController.java b/src/main/java/com/soft/line/controller/MpLoginController.java new file mode 100644 index 0000000..4328727 --- /dev/null +++ b/src/main/java/com/soft/line/controller/MpLoginController.java @@ -0,0 +1,42 @@ +package com.soft.line.controller; + +import com.soft.line.service.LoginService; +import com.soft.line.util.MP.AjaxResult; +import com.soft.line.util.exception.ResultData; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletRequest; +import java.util.Map; + +/** + * @Description 小程序登录相关 + * @author wu.xueqiao on 2020/6/1. + * @version 0.1 + */ +@RestController +public class MpLoginController { + + @Autowired + private LoginService loginService; + @Autowired + HttpServletRequest request; + + + @PostMapping("/autoLogin") + public AjaxResult autoLogin(@RequestBody Map map){ + return loginService.autoLogin(map.get("code")); + } + + @PostMapping("/bindUserInfo") + public AjaxResult bindUserInfo(@RequestBody Map paraMap) { + return loginService.bindUserInfo(paraMap); + } + + @PostMapping("/getUserInfo") + public AjaxResult getUserInfo(@RequestBody Map paraMap) { + return loginService.getUserInfo(paraMap); + } +} diff --git a/src/main/java/com/soft/line/entity/UserInfoToken.java b/src/main/java/com/soft/line/entity/UserInfoToken.java index e74eec7..48c0625 100644 --- a/src/main/java/com/soft/line/entity/UserInfoToken.java +++ b/src/main/java/com/soft/line/entity/UserInfoToken.java @@ -9,13 +9,11 @@ import lombok.Data; @Data public class UserInfoToken { - private Integer userId; + private Integer id; private String userName; - private String account; - private String accountApp; - private String empCode; - private Integer orgId; - private String orgName; - private String token; + private String phone; + private int roleId; + private String password; + } diff --git a/src/main/java/com/soft/line/filter/UserTokenDto.java b/src/main/java/com/soft/line/filter/UserTokenDto.java index 953c6e2..bf738ba 100644 --- a/src/main/java/com/soft/line/filter/UserTokenDto.java +++ b/src/main/java/com/soft/line/filter/UserTokenDto.java @@ -1,5 +1,6 @@ package com.soft.line.filter; +import com.soft.line.entity.UserInfoToken; import lombok.Data; import java.io.Serializable; @@ -7,42 +8,12 @@ import java.util.List; import java.util.Map; +@Data public class UserTokenDto implements Serializable { - private String userName; - private String password; + + private UserInfoToken userInfo; private String token; - public String getUserName() { - return userName; - } - - public void setUserName(String userName) { - this.userName = userName; - } - - public String getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } - - public String getToken() { - return token; - } - - public void setToken(String token) { - this.token = token; - } - - @Override - public String toString() { - return "UserTokenDto{" + - "userName='" + userName + '\'' + - ", password='" + password + '\'' + - ", token='" + token + '\'' + - '}'; - } + } diff --git a/src/main/java/com/soft/line/mapper/UserInfoMapper.java b/src/main/java/com/soft/line/mapper/UserInfoMapper.java index 49c98db..629bb3e 100644 --- a/src/main/java/com/soft/line/mapper/UserInfoMapper.java +++ b/src/main/java/com/soft/line/mapper/UserInfoMapper.java @@ -37,4 +37,10 @@ public interface UserInfoMapper { int delUser(int id); int updateUserInfo(UserInfo userInfo); + + UserInfo getUserInfoByOpenId(String openId); + + UserInfo getUserInfoByPhoneAndUserNameAndPassword(String phone, String userName, String password); + + int updateOpenIdById(String openId, int id); } \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/UserInfoMapper.xml b/src/main/java/com/soft/line/mapper/UserInfoMapper.xml index 7140ac4..78996d5 100644 --- a/src/main/java/com/soft/line/mapper/UserInfoMapper.xml +++ b/src/main/java/com/soft/line/mapper/UserInfoMapper.xml @@ -89,4 +89,29 @@ WHERE `id`=#{id,jdbdType=INTEGER} + + + + + UPDATE `user_info` + SET `open_id`=#{openId,jdbcType=VARCHAR} + WHERE `id`=#{id,jdbcType=INTEGER} + + \ No newline at end of file diff --git a/src/main/java/com/soft/line/service/LoginService.java b/src/main/java/com/soft/line/service/LoginService.java index d6b1a69..1ae13e1 100644 --- a/src/main/java/com/soft/line/service/LoginService.java +++ b/src/main/java/com/soft/line/service/LoginService.java @@ -1,6 +1,7 @@ package com.soft.line.service; import com.soft.line.entity.UserInfo; +import com.soft.line.util.MP.AjaxResult; import com.soft.line.util.exception.ResultData; import java.util.Map; @@ -15,4 +16,9 @@ public interface LoginService { public ResultData loginOut(); + public AjaxResult autoLogin(String code); + + AjaxResult bindUserInfo(Map map); + + AjaxResult getUserInfo(Map map); } diff --git a/src/main/java/com/soft/line/service/impl/LoginServiceImpl.java b/src/main/java/com/soft/line/service/impl/LoginServiceImpl.java index f76de05..8c059bc 100644 --- a/src/main/java/com/soft/line/service/impl/LoginServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/LoginServiceImpl.java @@ -1,11 +1,16 @@ package com.soft.line.service.impl; import com.soft.line.entity.UserInfo; +import com.soft.line.entity.UserInfoToken; import com.soft.line.filter.GsonUtil; import com.soft.line.filter.HttpRequestUtil; import com.soft.line.filter.UserTokenDto; import com.soft.line.mapper.UserInfoMapper; import com.soft.line.service.LoginService; +import com.soft.line.util.MP.AjaxResult; +import com.soft.line.util.MP.OpenIdUtil; +import com.soft.line.util.MP.SystemConstant; +import com.soft.line.util.exception.CommonResult; import com.soft.line.util.exception.ResultData; import com.soft.line.util.redis.RedisClient; import io.jsonwebtoken.Jwts; @@ -13,6 +18,7 @@ import io.jsonwebtoken.SignatureAlgorithm; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.HashMap; @@ -38,9 +44,14 @@ public class LoginServiceImpl implements LoginService { UserInfo userInfo= userInfoMapper.userLogin(map); if(userInfo!=null){ + UserInfoToken userInfoToken=new UserInfoToken(); + userInfoToken.setUserName(userInfo.getUserName()); + userInfoToken.setRoleId(userInfo.getRoleId()); + userInfoToken.setPhone(userInfo.getPhone()); + userInfoToken.setId(userInfo.getId()); + userInfoToken.setPassword(userInfo.getPassword()); UserTokenDto user=new UserTokenDto(); - user.setUserName(userInfo.getUserName()); - user.setPassword(userInfo.getPassword()); + user.setUserInfo(userInfoToken); String token=returnToken(user); user.setToken(token); if (token == null || "".equals(token)) { @@ -55,7 +66,7 @@ public class LoginServiceImpl implements LoginService { @Override public ResultData loginOut() { UserTokenDto userTokenDto=HttpRequestUtil.getUserToken(); - String key=userTokenDto.getUserName(); + String key=userTokenDto.getUserInfo().getUserName(); boolean out=REDIS_SERVICE.del(key); if(out){ return new ResultData(200,"退出登录成功！",null); @@ -66,22 +77,123 @@ public class LoginServiceImpl implements LoginService { } + public String returnToken(final UserTokenDto user) { - if (redisClient.getKeyValue(user.getUserName()) == null || "".equals(redisClient.getKeyValue(user.getUserName()))) { + if (redisClient.getKeyValue(user.getUserInfo().getUserName()) == null || "".equals(redisClient.getKeyValue(user.getUserInfo().getUserName()))) { final Map claims = new HashMap<>(); - claims.put("password", user.getPassword()); - claims.put("username", user.getUserName()); + claims.put("password", user.getUserInfo().getPassword()); + claims.put("username", user.getUserInfo().getUserName()); claims.put("uuid", UUID.randomUUID().toString()); final String token = Jwts.builder().setClaims(claims) .signWith(SignatureAlgorithm.HS512, HttpRequestUtil.key).compact(); user.setToken(token); - if (!redisClient.setKeyValue(user.getUserName(), GsonUtil.javabeanToJson(user),HttpRequestUtil.expire)) { + if (!redisClient.setKeyValue(user.getUserInfo().getUserName(), GsonUtil.javabeanToJson(user),HttpRequestUtil.expire)) { return null; } return token; } else { - redisClient.setKeyTimeout(user.getUserName(), HttpRequestUtil.expire); - return GsonUtil.jsonToJavaBean(redisClient.getKeyValue(user.getUserName())).getToken(); + redisClient.setKeyTimeout(user.getUserInfo().getUserName(), HttpRequestUtil.expire); + return GsonUtil.jsonToJavaBean(redisClient.getKeyValue(user.getUserInfo().getUserName())).getToken(); + } + } + + @Override + public AjaxResult autoLogin(String code) { + Map data=new HashMap<>(); + + //获取openId + String openId= OpenIdUtil.getOpenId(code); + + if (openId==null) { + System.out.println("获取openId失败！"); + return AjaxResult.error("获取微信信息失败，请稍后再试！"); + } + + UserInfo userInfo = userInfoMapper.getUserInfoByOpenId(openId); + + //用户已经绑定过openId 则签发token 以及返回userInfo + if (userInfo!=null) { + try { + final Map claims = new HashMap<>(); + claims.put("password", userInfo.getPassword()); + claims.put("username", userInfo.getUserName()); + claims.put("uuid", UUID.randomUUID().toString()); + final String token = Jwts.builder().setClaims(claims) + .signWith(SignatureAlgorithm.HS512, HttpRequestUtil.key).compact(); + data.put("userInfo", userInfo); + data.put("token", token); + } catch (Exception e) { + e.printStackTrace(); + log.error("签发token失败！", e); + return AjaxResult.error("登录失败，请稍后再试！"); + } + + return AjaxResult.success(data); + + } + //用户未绑定过openId + else { + //返回未绑定 + return AjaxResult.noBand(); } } + + @Override + public AjaxResult bindUserInfo(Map map) { + String code = map.get("code"); + String phone = map.get("phone"); + String userName = map.get("userName"); + String password = map.get("password"); + Map data=new HashMap<>(); + UserInfo userInfo= userInfoMapper.getUserInfoByPhoneAndUserNameAndPassword(phone, userName, password); + if (userInfo==null) { + return AjaxResult.error("手机或账号或密码错误！"); + } + //获取openId + String openId=OpenIdUtil.getOpenId(code); + + if (openId==null) { + System.out.println("获取openId失败！"); + return AjaxResult.error("获取微信信息失败，请稍后再试！"); + } + //绑定openId + userInfoMapper.updateOpenIdById(openId, userInfo.getId()); + try { + final Map claims = new HashMap<>(); + claims.put("password", userInfo.getPassword()); + claims.put("username", userInfo.getUserName()); + claims.put("uuid", UUID.randomUUID().toString()); + final String token = Jwts.builder().setClaims(claims) + .signWith(SignatureAlgorithm.HS512, HttpRequestUtil.key).compact(); + data.put("userInfo", userInfo); + data.put("token", token); + } catch (Exception e) { + e.printStackTrace(); + log.error("签发token失败！", e); + return AjaxResult.error("登录失败，请稍后再试！"); + } + return AjaxResult.success(data); + } + + @Override + @Transactional + public AjaxResult getUserInfo(Map map) { + UserTokenDto userTokenDto= HttpRequestUtil.getUserToken(); + int id=userTokenDto.getUserInfo().getId(); + String code=map.get("code"); + //获取openId + String openId=OpenIdUtil.getOpenId(code); + if (openId==null) { + System.out.println("获取openId失败！"); + return AjaxResult.error("获取微信信息失败，请稍后再试！"); + } + UserInfo userInfo = userInfoMapper.getUserInfoByOpenId(openId); + //有token又没有根据此openId查出用户 说明openId变了 此时根据用户id查询绑定用户openId + if(userInfo==null) { + userInfoMapper.updateOpenIdById(openId, id); + userInfo = userInfoMapper.getUserInfoByOpenId(openId); + } + + return AjaxResult.success(userInfo); + } } diff --git a/src/main/java/com/soft/line/service/impl/UserInfoServiceImpl.java b/src/main/java/com/soft/line/service/impl/UserInfoServiceImpl.java index ea949b3..ceba75c 100644 --- a/src/main/java/com/soft/line/service/impl/UserInfoServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/UserInfoServiceImpl.java @@ -52,7 +52,7 @@ public class UserInfoServiceImpl implements UserInfoService { @Override public int addUser(UserInfo userInfo) { UserTokenDto userTokenDto= HttpRequestUtil.getUserToken(); - userInfo.setModifyPerson(userTokenDto.getUserName()); + userInfo.setModifyPerson(userTokenDto.getUserInfo().getUserName()); if (userInfo.getId()==null){ return userInfoMapper.insert(userInfo); }else { diff --git a/src/main/java/com/soft/line/util/MP/AjaxResult.java b/src/main/java/com/soft/line/util/MP/AjaxResult.java new file mode 100644 index 0000000..97c9832 --- /dev/null +++ b/src/main/java/com/soft/line/util/MP/AjaxResult.java @@ -0,0 +1,236 @@ +package com.soft.line.util.MP; + + +import java.util.HashMap; + +/** + * @Description: 封装的controller返回值类 + * + * @version: v1.0.0 + * @author: zlx + * @date: 2020年3月6日 下午1:10:49 + */ +public class AjaxResult extends HashMap { + private static final long serialVersionUID = 1L; + + /** 状态码 */ + public static final String CODE_TAG = "code"; + + /** 返回内容 */ + public static final String MSG_TAG = "msg"; + + /** 数据对象 */ + public static final String DATA_TAG = "data"; + + /** + * 状态类型 + */ + public enum Type { + + /** 成功 */ + SUCCESS(200), + /** 警告 */ + WARN(301), + /** 未绑定 */ + NOBAND(501), + /** 错误 */ + ERROR(500); + + private final int value; + + Type(int value) { + this.value = value; + } + + public int value() { + return this.value; + } + } + + /** + * 初始化一个新创建的 AjaxResult 对象，使其表示一个空消息。 + */ + public AjaxResult() { + } + + /** + * 初始化一个新创建的 AjaxResult 对象 + * + * @param type 状态类型 + * @param msg 返回内容 + */ + public AjaxResult(Type type, String msg) { + super.put(CODE_TAG, type.value); + super.put(MSG_TAG, msg); + } + + /** + * 初始化一个新创建的 AjaxResult 对象 + * + * @param type 状态类型 + * @param msg 返回内容 + * @param data 数据对象 + */ + public AjaxResult(Type type, String msg, Object data) { + super.put(CODE_TAG, type.value); + super.put(MSG_TAG, msg); + if (data != null) { + super.put(DATA_TAG, data); + } + } + + /** + * 返回成功消息 + * + * @return 成功消息 + */ + public static AjaxResult success() { + return AjaxResult.success("成功"); + } + + /** + * 返回成功数据 + * + * @return 成功消息 + */ + public static AjaxResult success(Object data) { + return AjaxResult.success("成功", data); + } + + /** + * 返回成功消息 + * + * @param msg 返回内容 + * @return 成功消息 + */ + public static AjaxResult success(String msg) { + return AjaxResult.success(msg, null); + } + + /** + * 返回成功消息 + * + * @param msg 返回内容 + * @param data 数据对象 + * @return 成功消息 + */ + public static AjaxResult success(String msg, Object data) { + return new AjaxResult(Type.SUCCESS, msg, data); + } + + /** + * 返回成功消息带有服务器时间秒值 + * + * @param data + * @return + */ + public static AjaxResult successWithServerTime() { + AjaxResult ajaxResult = AjaxResult.success(); + ajaxResult.put("ServerTime", DateUtil.getNowTimeSecond()); + return ajaxResult; + } + + /** + * 返回成功消息带有服务器时间秒值 + * + * @param data + * @return + */ + public static AjaxResult successWithServerTime(Object data) { + AjaxResult ajaxResult = AjaxResult.success(data); + ajaxResult.put("ServerTime", DateUtil.getNowTimeSecond()); + return ajaxResult; + } + + /** + * 返回警告消息 + * + * @param msg 返回内容 + * @return 警告消息 + */ + public static AjaxResult warn(String msg) { + return AjaxResult.warn(msg, null); + } + + /** + * 返回警告消息 + * + * @param msg 返回内容 + * @param data 数据对象 + * @return 警告消息 + */ + public static AjaxResult warn(String msg, Object data) { + return new AjaxResult(Type.WARN, msg, data); + } + + /** + * 返回错误消息 + * + * @return + */ + public static AjaxResult error() { + return AjaxResult.error("失败"); + } + + /** + * 返回错误消息 + * + * @param msg 返回内容 + * @return 警告消息 + */ + public static AjaxResult error(String msg) { + return AjaxResult.error(msg, null); + } + + /** + * 返回错误消息 + * + * @param msg 返回内容 + * @param data 数据对象 + * @return 警告消息 + */ + public static AjaxResult error(String msg, Object data) { + return new AjaxResult(Type.ERROR, msg, data); + } + + /** + * 返回错误消息带有服务器时间秒值 + * + * @return + */ + public static AjaxResult errorWithServerTime() { + AjaxResult ajaxResult = AjaxResult.error("失败"); + ajaxResult.put("ServerTime", DateUtil.getNowTimeSecond()); + return ajaxResult; + } + + /** + * 返回错误消息带有服务器时间秒值 + * + * @return + */ + public static AjaxResult errorWithServerTime(String msg) { + AjaxResult ajaxResult = AjaxResult.error(msg); + ajaxResult.put("ServerTime", DateUtil.getNowTimeSecond()); + return ajaxResult; + } + + /** + * 返回未绑定 + * + * @return + */ + public static AjaxResult noBand() { + return AjaxResult.noBand("未绑定"); + + } + + /** + * 返回未绑定 + * + * @return + */ + private static AjaxResult noBand(String string) { + return new AjaxResult(Type.NOBAND, string); + } +} diff --git a/src/main/java/com/soft/line/util/MP/DateUtil.java b/src/main/java/com/soft/line/util/MP/DateUtil.java new file mode 100644 index 0000000..add112c --- /dev/null +++ b/src/main/java/com/soft/line/util/MP/DateUtil.java @@ -0,0 +1,103 @@ +package com.soft.line.util.MP; + +import java.text.DateFormat; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; + +/** + * @Description: 日期工具类 + * + * @version: v1.0.0 + * @author: zlx + * @date: 2020年3月17日 上午10:41:08 + */ +public class DateUtil { + + /** + * 获取yyyy-MM-dd格式今日日期字符串 + * + * @return 例："2020-01-01" + */ + public static String getSimpleNowDateStr() { + DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); + Date date = new Date(); + String dateStr = dateFormat.format(date); + return dateStr; + } + + /** + * 获取某格式今日日期字符串 + * + * @return + */ + public static String getNowDateStr(String formatStr) { + DateFormat dateFormat = new SimpleDateFormat(formatStr); + Date date = new Date(); + String dateStr = dateFormat.format(date); + return dateStr; + } + + /** + * 获取某格式某日期字符串 + * + * @return + */ + public static String getDateStr(Date date,String formatStr) { + DateFormat dateFormat = new SimpleDateFormat(formatStr); + String dateStr = dateFormat.format(date); + return dateStr; + } + + /** + * 判断当前时间是否在[startTime, endTime]区间，注意时间格式要一致 + * + * @param nowTime + * @param startTime + * @param endTime + * @return + */ + public static boolean isEffectiveDate(Date nowTime, Date startTime, Date endTime) { + if (nowTime.getTime() == startTime.getTime() || nowTime.getTime() == endTime.getTime()) { + return true; + } + + Calendar date = Calendar.getInstance(); + date.setTime(nowTime); + + Calendar begin = Calendar.getInstance(); + begin.setTime(startTime); + + Calendar end = Calendar.getInstance(); + end.setTime(endTime); + + if (date.after(begin) && date.before(end)) { + return true; + } else { + return false; + } + } + + /** + * 获取当前时间秒值 + * + * @return + */ + public static long getNowTimeSecond() { + return new Date().getTime() / 1000; + } + + + /** + * 获取yyyyMMddHHmmssSSS格式今日日期字符串 + * + * @return 例："20200326190038998" + */ + public static String getSimpleDayTimeStr() { + DateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHmmssSSS"); + Date date = new Date(); + String dateStr = dateFormat.format(date); + return dateStr; + } + +} diff --git a/src/main/java/com/soft/line/util/MP/HttpClientUtil.java b/src/main/java/com/soft/line/util/MP/HttpClientUtil.java new file mode 100644 index 0000000..dafb528 --- /dev/null +++ b/src/main/java/com/soft/line/util/MP/HttpClientUtil.java @@ -0,0 +1,113 @@ +package com.soft.line.util.MP; + +import lombok.extern.slf4j.Slf4j; +import org.apache.http.HttpResponse; +import org.apache.http.client.CookieStore; +import org.apache.http.client.config.RequestConfig; +import org.apache.http.client.entity.UrlEncodedFormEntity; +import org.apache.http.client.methods.HttpGet; +import org.apache.http.client.methods.HttpPost; +import org.apache.http.impl.client.BasicCookieStore; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.HttpClients; +import org.apache.http.impl.cookie.BasicClientCookie; +import org.apache.http.message.BasicNameValuePair; +import org.apache.http.util.EntityUtils; + +import java.io.IOException; +import java.util.List; + +/** + * @Description: HttpClient工具类 发送post和get请求 + * + * @version: v1.0.0 + * @author: zlx + * @date: 2020年3月17日 下午3:12:43 + */ +@Slf4j +public class HttpClientUtil { + + public static CookieStore cookieStore = new BasicCookieStore(); + public static CloseableHttpClient httpCilent = HttpClients.custom().setDefaultCookieStore(cookieStore).build(); + + public static String httpPost(String url, List list) { + + // 配置超时时间 + RequestConfig requestConfig = RequestConfig.custom().setConnectTimeout(5000).setConnectionRequestTimeout(5000) + .setSocketTimeout(5000).setRedirectsEnabled(true).build(); + + HttpPost httpPost = new HttpPost(url); + // 设置超时时间 + httpPost.setConfig(requestConfig); + + String strResult = ""; + int StatusCode = 404; + try { + if (list != null) { + UrlEncodedFormEntity entity = new UrlEncodedFormEntity(list, "UTF-8"); + // 设置post求情参数 + httpPost.setEntity(entity); + } + HttpResponse httpResponse = httpCilent.execute(httpPost); + + if (httpResponse != null) { + StatusCode = httpResponse.getStatusLine().getStatusCode(); + if (httpResponse.getStatusLine().getStatusCode() == 200) { + strResult = EntityUtils.toString(httpResponse.getEntity()); + log.info("post/" + StatusCode + ":" + strResult); + return strResult; + } else { + strResult = "Error Response: " + httpResponse.getStatusLine().toString(); + log.info("post/" + StatusCode + ":" + strResult); + strResult = null; + } + } + + } catch (Exception e) { + log.error(e.getMessage()); + } + + return strResult; + } + + public static String HttpGet(String url) { + + RequestConfig requestConfig = RequestConfig.custom().setConnectTimeout(5000) // 设置连接超时时间 + .setConnectionRequestTimeout(5000) // 设置请求超时时间 + .setSocketTimeout(5000).setRedirectsEnabled(true)// 默认允许自动重定向 + .build(); + HttpGet httpGet2 = new HttpGet(url); + httpGet2.setConfig(requestConfig); + String srtResult = null; + int StatusCode = 404; + try { + HttpResponse httpResponse = httpCilent.execute(httpGet2); + StatusCode = httpResponse.getStatusLine().getStatusCode(); + if (httpResponse.getStatusLine().getStatusCode() == 200) { + srtResult = EntityUtils.toString(httpResponse.getEntity());// 获得返回的结果 + log.info("get/" + StatusCode + ":" + srtResult); + return srtResult; + } else { + srtResult = EntityUtils.toString(httpResponse.getEntity());// 获得返回的结果 + log.info("get/" + StatusCode + ":" + srtResult); + return null; + } + } catch (IOException e) { + log.error(e.getMessage()); + } + return null; + } + + public static void setCookieStore(List cookielist) { + for (BasicClientCookie cookie : cookielist) { + HttpClientUtil.cookieStore.addCookie(cookie); + } + } + + public static void createCookie(List cookielist) { + for (BasicClientCookie cookie : cookielist) { + HttpClientUtil.cookieStore.addCookie(cookie); + } + } + +} diff --git a/src/main/java/com/soft/line/util/MP/OpenIdUtil.java b/src/main/java/com/soft/line/util/MP/OpenIdUtil.java new file mode 100644 index 0000000..1b3dc0e --- /dev/null +++ b/src/main/java/com/soft/line/util/MP/OpenIdUtil.java @@ -0,0 +1,22 @@ +package com.soft.line.util.MP; + + +import com.alibaba.fastjson.JSONObject; + +public class OpenIdUtil { + + public static String getOpenId (String code) { + + + String url = "https://api.weixin.qq.com/sns/jscode2session?appid=" + + SystemConstant.APP_ID + "&secret=" + SystemConstant.APP_SECRET + "&js_code=" + + code + "&grant_type=authorization_code"; + + String reString= HttpClientUtil.httpPost(url, null); + + JSONObject jsonObject = JSONObject.parseObject(reString); + + String openId=jsonObject.getString("openid"); + return openId; + } +} diff --git a/src/main/java/com/soft/line/util/MP/SystemConstant.java b/src/main/java/com/soft/line/util/MP/SystemConstant.java new file mode 100644 index 0000000..359faba --- /dev/null +++ b/src/main/java/com/soft/line/util/MP/SystemConstant.java @@ -0,0 +1,34 @@ +package com.soft.line.util.MP; + +/** + * @Description: 系统常量 + * + * @version: v1.0.0 + * @author: zlx + * @date: 2020年3月6日 下午1:16:12 + */ +public class SystemConstant { + + // 刷新token（有返回值） + public static final int RESCODE_REFTOKEN_MSG = 1006; + // 刷新token + public static final int RESCODE_REFTOKEN = 1007; + + // token不存在 + public static final int JWT_ERRCODE_NULL = 4000; + // token 过期 + public static final int JWT_ERRCODE_EXPIRE = 4001; + // 验证不通过 + public static final int JWT_ERRCODE_FAIL = 4002; + + public static final String JWT_SECERT = "8677df7fc3a34e26a61c034d5ec8245d"; + + public static final long JWT_TTL = 10 * 1000;// M/d/h/m/s/ms + + //小程序appId + public static final String APP_ID="wx670dad59ddddc338"; + + //小程序appSecret + public static final String APP_SECRET ="a4d7f702c8f36d9f8a7f10f87b851711"; + +} -- Gitee From ec89a1f54c7e453546f1714b899a4b80a41f78c0 Mon Sep 17 00:00:00 2001 From: ljc Date: Mon, 1 Jun 2020 10:10:32 +0800 Subject: [PATCH 068/211] =?UTF-8?q?=E5=90=88=E5=90=8C=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/soft/line/controller/ContractInfoController.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/soft/line/controller/ContractInfoController.java b/src/main/java/com/soft/line/controller/ContractInfoController.java index fad4372..623125c 100644 --- a/src/main/java/com/soft/line/controller/ContractInfoController.java +++ b/src/main/java/com/soft/line/controller/ContractInfoController.java @@ -4,7 +4,9 @@ import com.soft.line.service.ContractInfoService; import com.soft.line.util.exception.CommonResult; import com.soft.line.util.exception.ResultData; import com.soft.line.util.jackson.converter.StringToDateUtil; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -16,6 +18,8 @@ import java.util.Map; * @author wu.xueqiao on 2020/5/21. * @version 0.1 */ +@Api(description = "合同接口") +@Slf4j @RequestMapping("/dataManage") @RestController public class ContractInfoController { @@ -35,14 +39,14 @@ public class ContractInfoController { } @ApiOperation(value = "删除证书", notes = "删除证书") - @DeleteMapping("/certificate") + @DeleteMapping("/contract") public ResultData deleteCertificate(@RequestBody Map map){ contractInfoService.delete(map); return new ResultData(200,"删除成功",null); } @ApiOperation(value = "保存合同", notes = "保存合同") - @PostMapping("/certificate") + @PostMapping("/contract") public ResultData saveCertificate(@RequestBody Map map){ if (contractInfoService.countContractByIdAndDeptAndTypeAndName((Integer)map.get("id"),(String)map.get("depId"), (String)map.get("proId"),(String)map.get("contractName"))>1){ -- Gitee From 62d76a5a1fdf1f62626240a683846e7775194bd5 Mon Sep 17 00:00:00 2001 From: wuxueqiao <17625808004@163.com> Date: Mon, 1 Jun 2020 10:42:15 +0800 Subject: [PATCH 069/211] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- softline-files-manage.iml | 1 + .../line/service/impl/LoginServiceImpl.java | 30 +++++++++++-------- 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/softline-files-manage.iml b/softline-files-manage.iml index 631323f..483cf86 100644 --- a/softline-files-manage.iml +++ b/softline-files-manage.iml @@ -25,6 +25,7 @@ + diff --git a/src/main/java/com/soft/line/service/impl/LoginServiceImpl.java b/src/main/java/com/soft/line/service/impl/LoginServiceImpl.java index 8c059bc..4d21f14 100644 --- a/src/main/java/com/soft/line/service/impl/LoginServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/LoginServiceImpl.java @@ -114,12 +114,15 @@ public class LoginServiceImpl implements LoginService { //用户已经绑定过openId 则签发token 以及返回userInfo if (userInfo!=null) { try { - final Map claims = new HashMap<>(); - claims.put("password", userInfo.getPassword()); - claims.put("username", userInfo.getUserName()); - claims.put("uuid", UUID.randomUUID().toString()); - final String token = Jwts.builder().setClaims(claims) - .signWith(SignatureAlgorithm.HS512, HttpRequestUtil.key).compact(); + UserInfoToken userInfoToken=new UserInfoToken(); + userInfoToken.setUserName(userInfo.getUserName()); + userInfoToken.setRoleId(userInfo.getRoleId()); + userInfoToken.setPhone(userInfo.getPhone()); + userInfoToken.setId(userInfo.getId()); + userInfoToken.setPassword(userInfo.getPassword()); + UserTokenDto user=new UserTokenDto(); + user.setUserInfo(userInfoToken); + String token=returnToken(user); data.put("userInfo", userInfo); data.put("token", token); } catch (Exception e) { @@ -159,12 +162,15 @@ public class LoginServiceImpl implements LoginService { //绑定openId userInfoMapper.updateOpenIdById(openId, userInfo.getId()); try { - final Map claims = new HashMap<>(); - claims.put("password", userInfo.getPassword()); - claims.put("username", userInfo.getUserName()); - claims.put("uuid", UUID.randomUUID().toString()); - final String token = Jwts.builder().setClaims(claims) - .signWith(SignatureAlgorithm.HS512, HttpRequestUtil.key).compact(); + UserInfoToken userInfoToken=new UserInfoToken(); + userInfoToken.setUserName(userInfo.getUserName()); + userInfoToken.setRoleId(userInfo.getRoleId()); + userInfoToken.setPhone(userInfo.getPhone()); + userInfoToken.setId(userInfo.getId()); + userInfoToken.setPassword(userInfo.getPassword()); + UserTokenDto user=new UserTokenDto(); + user.setUserInfo(userInfoToken); + String token=returnToken(user); data.put("userInfo", userInfo); data.put("token", token); } catch (Exception e) { -- Gitee From 94928dec49935c659700f5460f633dcb5cd6a444 Mon Sep 17 00:00:00 2001 From: ljc Date: Mon, 1 Jun 2020 17:49:46 +0800 Subject: [PATCH 070/211] =?UTF-8?q?=E5=90=88=E5=90=8C=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CertificateInfoController.java | 2 +- .../controller/ContractInfoController.java | 6 +++--- .../line/controller/MenuInfoController.java | 18 +++++++++--------- .../soft/line/mapper/ContractInfoMapper.xml | 2 +- .../soft/line/mapper/MenuButtonInfoMapper.xml | 2 +- .../com/soft/line/mapper/RoleMenuMapper.xml | 4 ++-- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/soft/line/controller/CertificateInfoController.java b/src/main/java/com/soft/line/controller/CertificateInfoController.java index 63bcd4d..7a68d59 100644 --- a/src/main/java/com/soft/line/controller/CertificateInfoController.java +++ b/src/main/java/com/soft/line/controller/CertificateInfoController.java @@ -52,7 +52,7 @@ public class CertificateInfoController { } @ApiOperation(value = "获取所有证书列表", notes = "获取所有证书列表") - @GetMapping("/certificate") + @PostMapping("/certificates") public CommonResult getAllCertificates(@RequestBody Map map){ return CommonResult.success(certificateInfoService.getAllCertificates(map)); } diff --git a/src/main/java/com/soft/line/controller/ContractInfoController.java b/src/main/java/com/soft/line/controller/ContractInfoController.java index 623125c..8e44b20 100644 --- a/src/main/java/com/soft/line/controller/ContractInfoController.java +++ b/src/main/java/com/soft/line/controller/ContractInfoController.java @@ -33,7 +33,7 @@ public class ContractInfoController { } @ApiOperation(value = "获取所有合同", notes = "获取所有合同") - @GetMapping("/contract") + @PostMapping("/contracts") public CommonResult getAllContracts(@RequestBody Map map){ return CommonResult.success(contractInfoService.getAllContracts(map)); } @@ -53,9 +53,9 @@ public class ContractInfoController { return new ResultData(200,"相同部门相同项目类型下存在相同合同名称",null); } - if (!isDouble((String)map.get("totalAmount"))){ + /*if (!isDouble((String)map.get("totalAmount"))){ return new ResultData(200,"总金额不是数字类型",null); - } + }*/ Date signDate = StringToDateUtil.convert((String)map.get("signTime")); Date beginDate = StringToDateUtil.convert((String)map.get("beginDate")); Date endDate =StringToDateUtil.convert((String)map.get("endDate")); diff --git a/src/main/java/com/soft/line/controller/MenuInfoController.java b/src/main/java/com/soft/line/controller/MenuInfoController.java index 21ad5ee..da2fcf1 100644 --- a/src/main/java/com/soft/line/controller/MenuInfoController.java +++ b/src/main/java/com/soft/line/controller/MenuInfoController.java @@ -54,34 +54,34 @@ public class MenuInfoController { @ApiOperation(value = "删除菜单") @DeleteMapping("/menu") - public ResultData deleteMenu(@RequestBody Map map){ + public CommonResult deleteMenu(@RequestBody Map map){ menuInfoService.delete((Integer) map.get("id")); - return new ResultData(200,"删除成功",null); + return CommonResult.success("删除成功"); } @ApiOperation(value = "保存菜单") @PostMapping("/menu") - public ResultData saveMenu(@RequestBody Map map) { + public CommonResult saveMenu(@RequestBody Map map) { MenuInfo menuInfo = new MenuInfo(); menuInfo.setId((Integer) map.get("id")); if (map.get("menuName")==null||"".equals((String)map.get("menuName"))){ - return new ResultData(200,"菜单名称不能为空",null); + return CommonResult.success("菜单名称不能为空"); }else{ //新增时判断menuName是否重复 menuInfo.setMenuName(map.get("menuName").toString()); if (menuInfoService.countMenuName(menuInfo.getId(),menuInfo.getMenuName())>0){ - return new ResultData(200,"菜单名称已存在",null); + return CommonResult.success("菜单名称已存在"); } } menuInfo.setMenuIcon(map.get("menuIcon")==null?"":map.get("menuIcon").toString()); menuInfo.setMenuUrl(map.get("menuUrl")==null?"":map.get("menuUrl").toString()); if (map.get("orderBy")==null){ - return new ResultData(200,"菜单排序不能为空",null); + return CommonResult.success("菜单排序不能为空"); }else{ menuInfo.setOrderBy((map.get("orderBy")==null?"":map.get("orderBy").toString())); if (menuInfoService.countOrderBy(menuInfo.getId(),menuInfo.getOrderBy())>0){ - return new ResultData(200,"菜单排序已存在",null); + return CommonResult.success("菜单排序已存在"); } } @@ -92,7 +92,7 @@ public class MenuInfoController { }else { MenuInfo pMenu = menuInfoService.selectParentMenu(menuInfo.getpId()); if (pMenu==null){ - return new ResultData(200,"父级菜单不存在",null); + return CommonResult.success("父级菜单不存在"); } menuInfo.setState(pMenu.getState()+1); } @@ -110,7 +110,7 @@ public class MenuInfoController { }else{ menuInfoService.addMenuInfo(menuInfo); } - return new ResultData(200,"保存菜单成功",null); + return CommonResult.success("保存菜单成功"); } diff --git a/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml b/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml index 1537248..63fcff0 100644 --- a/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml +++ b/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml @@ -57,7 +57,7 @@ `payment` = #{payment,jdbcType=VARCHAR}, `note` = #{note,jdbcType=VARCHAR}, `modify_person` = #{modifyPerson,jdbcType=VARCHAR}, - `modify_time` = #{modifyTime,jdbcType=TIMESTAMP}, + `modify_time` = #{modifyTime,jdbcType=TIMESTAMP} where `id` = #{id,jdbcType=INTEGER} diff --git a/src/main/java/com/soft/line/mapper/MenuButtonInfoMapper.xml b/src/main/java/com/soft/line/mapper/MenuButtonInfoMapper.xml index 0a00292..7f9b5ac 100644 --- a/src/main/java/com/soft/line/mapper/MenuButtonInfoMapper.xml +++ b/src/main/java/com/soft/line/mapper/MenuButtonInfoMapper.xml @@ -35,7 +35,7 @@ - delete from menu_button_info where menu_id =(select mi.id from menu_info mi where mi.id=#{menuId}) + delete from menu_button_info where menu_id in (select mi.id from menu_info mi where mi.id=#{menuId}) diff --git a/src/main/java/com/soft/line/mapper/RoleMenuMapper.xml b/src/main/java/com/soft/line/mapper/RoleMenuMapper.xml index 128d206..8d7cce3 100644 --- a/src/main/java/com/soft/line/mapper/RoleMenuMapper.xml +++ b/src/main/java/com/soft/line/mapper/RoleMenuMapper.xml @@ -28,10 +28,10 @@ - delete from role_menu where menu_button_id = (select mbi.id from menu_button_info mbi where mbi.menu_id =(select mi.id from menu_info mi where mi.id=#{menuId})) + delete from role_menu where menu_button_id in (select mbi.id from menu_button_info mbi where mbi.menu_id =(select mi.id from menu_info mi where mi.id=#{menuId})) - delete from role_menu where menu_button_id = (select mbi.id from menu_button_info mbi where mbi.menu_id=#{menuId} and mbi.button_id=#{buttonId}) + delete from role_menu where menu_button_id in (select mbi.id from menu_button_info mbi where mbi.menu_id=#{menuId} and mbi.button_id=#{buttonId}) \ No newline at end of file -- Gitee From 301a49983787a518c50c81caac4b6e7d80d30d34 Mon Sep 17 00:00:00 2001 From: ljc <1119265069@qq.com> Date: Mon, 1 Jun 2020 21:00:46 +0800 Subject: [PATCH 071/211] =?UTF-8?q?=E8=A7=92=E8=89=B2=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CertificateInfoController.java | 16 +++++----- .../controller/ContractInfoController.java | 26 ++++----------- .../line/controller/RoleInfoController.java | 13 ++++---- .../java/com/soft/line/entity/RoleInfo.java | 32 +++++++++++++++++++ .../com/soft/line/mapper/MenuInfoMapper.xml | 2 +- .../com/soft/line/mapper/RoleInfoMapper.java | 4 +-- .../com/soft/line/mapper/RoleInfoMapper.xml | 20 +++++++----- 7 files changed, 69 insertions(+), 44 deletions(-) diff --git a/src/main/java/com/soft/line/controller/CertificateInfoController.java b/src/main/java/com/soft/line/controller/CertificateInfoController.java index 7a68d59..584d430 100644 --- a/src/main/java/com/soft/line/controller/CertificateInfoController.java +++ b/src/main/java/com/soft/line/controller/CertificateInfoController.java @@ -59,32 +59,32 @@ public class CertificateInfoController { @ApiOperation(value = "删除证书", notes = "删除证书") @DeleteMapping("/certificate") - public ResultData deleteCertificate(@RequestBody Map map){ + public CommonResult deleteCertificate(@RequestBody Map map){ certificateInfoService.delete(map); - return new ResultData(200,"删除成功",null); + return CommonResult.success("删除成功"); } @ApiOperation(value = "保存证书", notes = "保存证书") @PostMapping("/certificate") - public ResultData saveCertificate(@RequestBody Map map){ + public CommonResult saveCertificate(@RequestBody Map map){ if (certificateInfoService.countByCName((Integer)map.get("id"),(String)map.get("certType"),(String)map.get("certName"))>0){ - return new ResultData(200,"相同部门存在相同证书名称",null); + return CommonResult.success("相同部门存在相同证书名称"); }else if(certificateInfoService.countByCName((Integer)map.get("id"),(String)map.get("certType"),(String)map.get("certId"))>0){ - return new ResultData(200,"相同部门存在相同证书编号",null); + return CommonResult.success("相同部门存在相同证书编号"); } Date beginDate = StringToDateUtil.convert((String)map.get("beginDate")); Date endDate =StringToDateUtil.convert((String)map.get("endDate")); if (beginDate.after(endDate)){ - return new ResultData(200,"起始日期不能>终止日期",null); + return CommonResult.success("起始日期不能>终止日期"); } if ((Integer)map.get("id")==null){ //添加 certificateInfoService.add(map); - return new ResultData(200,"添加成功",null); + return CommonResult.success("添加成功"); }else{ //修改 certificateInfoService.update(map); - return new ResultData(200,"修改成功",null); + return CommonResult.success("修改成功"); } } diff --git a/src/main/java/com/soft/line/controller/ContractInfoController.java b/src/main/java/com/soft/line/controller/ContractInfoController.java index 8e44b20..3e3fc76 100644 --- a/src/main/java/com/soft/line/controller/ContractInfoController.java +++ b/src/main/java/com/soft/line/controller/ContractInfoController.java @@ -40,17 +40,17 @@ public class ContractInfoController { @ApiOperation(value = "删除证书", notes = "删除证书") @DeleteMapping("/contract") - public ResultData deleteCertificate(@RequestBody Map map){ + public CommonResult deleteCertificate(@RequestBody Map map){ contractInfoService.delete(map); - return new ResultData(200,"删除成功",null); + return CommonResult.success("删除成功"); } @ApiOperation(value = "保存合同", notes = "保存合同") @PostMapping("/contract") - public ResultData saveCertificate(@RequestBody Map map){ + public CommonResult saveCertificate(@RequestBody Map map){ if (contractInfoService.countContractByIdAndDeptAndTypeAndName((Integer)map.get("id"),(String)map.get("depId"), (String)map.get("proId"),(String)map.get("contractName"))>1){ - return new ResultData(200,"相同部门相同项目类型下存在相同合同名称",null); + return CommonResult.success("相同部门相同项目类型下存在相同合同名称"); } /*if (!isDouble((String)map.get("totalAmount"))){ @@ -60,28 +60,16 @@ public class ContractInfoController { Date beginDate = StringToDateUtil.convert((String)map.get("beginDate")); Date endDate =StringToDateUtil.convert((String)map.get("endDate")); if (beginDate.after(endDate)){ - return new ResultData(200,"起始日期不能>终止日期",null); + return CommonResult.success("起始日期不能>终止日期"); } if ((Integer)map.get("id")==null){ //添加 contractInfoService.add(map); - return new ResultData(200,"添加成功",null); + return CommonResult.success("添加成功"); }else{ //修改 contractInfoService.update(map); - return new ResultData(200,"修改成功",null); - } - } - - public static boolean isDouble(String value) { - try { - Double.parseDouble(value); - if (value.contains(".")) { - return true; - } - return false; - } catch (NumberFormatException e) { - return false; + return CommonResult.success("修改成功"); } } diff --git a/src/main/java/com/soft/line/controller/RoleInfoController.java b/src/main/java/com/soft/line/controller/RoleInfoController.java index 9a0b17b..3029ca4 100644 --- a/src/main/java/com/soft/line/controller/RoleInfoController.java +++ b/src/main/java/com/soft/line/controller/RoleInfoController.java @@ -32,26 +32,27 @@ public class RoleInfoController { @DeleteMapping("/role") @ApiOperation(value = "删除角色") - public ResultData deleteRole(@RequestBody Map map) { + public CommonResult deleteRole(@RequestBody Map map) { roleInfoService.delete(map); - return new ResultData(200,"删除成功",null); + return CommonResult.success("删除成功"); } @PostMapping("/role") @ApiOperation(value = "保存角色") - public ResultData saveRole(@RequestBody Map map) { + public CommonResult saveRole(@RequestBody Map map) { if ((String)map.get("roleName")==null||"".equals((String)map.get("roleName"))){ - return new ResultData(200,"角色名称不能为空",null); + return CommonResult.success("角色名称不能为空"); }else if(roleInfoService.countRoleName((Integer)map.get("id"),(String)map.get("roleName")) > 0){ - return new ResultData(200,"角色名称已存在",null); + return CommonResult.success("角色名称已存在"); } if ((Integer)map.get("id")==null){ //添加 roleInfoService.add(map); + return CommonResult.success("添加成功"); }else{ //修改 roleInfoService.update(map); + return CommonResult.success("修改成功"); } - return new ResultData(200,"保存成功",null); } } diff --git a/src/main/java/com/soft/line/entity/RoleInfo.java b/src/main/java/com/soft/line/entity/RoleInfo.java index 7bb130f..8258af2 100644 --- a/src/main/java/com/soft/line/entity/RoleInfo.java +++ b/src/main/java/com/soft/line/entity/RoleInfo.java @@ -1,11 +1,19 @@ package com.soft.line.entity; +import java.util.Date; + public class RoleInfo { private Integer id; private String name; + private String state; + + private String modifyPerson; + + private Date modifyTime; + public Integer getId() { @@ -23,4 +31,28 @@ public class RoleInfo { public void setName(String name) { this.name = name == null ? null : name.trim(); } + + public String getState() { + return state; + } + + public void setState(String state) { + this.state = state ; + } + + public String getModifyPerson() { + return modifyPerson; + } + + public void setModifyPerson(String modifyPerson) { + this.modifyPerson = modifyPerson; + } + + public Date getModifyTime() { + return modifyTime; + } + + public void setModifyTime(Date modifyTime) { + this.modifyTime = modifyTime; + } } \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/MenuInfoMapper.xml b/src/main/java/com/soft/line/mapper/MenuInfoMapper.xml index cc763d0..cb616af 100644 --- a/src/main/java/com/soft/line/mapper/MenuInfoMapper.xml +++ b/src/main/java/com/soft/line/mapper/MenuInfoMapper.xml @@ -103,7 +103,7 @@ @@ -23,7 +27,7 @@ \ No newline at end of file -- Gitee From f78560e2777501b2846839c5af9162cfb49ff9ca Mon Sep 17 00:00:00 2001 From: ljc <1119265069@qq.com> Date: Mon, 1 Jun 2020 22:48:02 +0800 Subject: [PATCH 072/211] =?UTF-8?q?=E8=A7=92=E8=89=B2=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../line/controller/MenuInfoController.java | 2 +- .../line/controller/RoleInfoController.java | 7 +-- .../com/soft/line/entity/RoleMenuInfo.java | 11 ----- .../com/soft/line/mapper/RoleInfoMapper.java | 5 ++- .../com/soft/line/mapper/RoleInfoMapper.xml | 6 +-- .../soft/line/service/RoleInfoService.java | 3 +- .../service/impl/RoleInfoServiceImpl.java | 44 ++++++++++++------- 7 files changed, 37 insertions(+), 41 deletions(-) delete mode 100644 src/main/java/com/soft/line/entity/RoleMenuInfo.java diff --git a/src/main/java/com/soft/line/controller/MenuInfoController.java b/src/main/java/com/soft/line/controller/MenuInfoController.java index da2fcf1..7468fe3 100644 --- a/src/main/java/com/soft/line/controller/MenuInfoController.java +++ b/src/main/java/com/soft/line/controller/MenuInfoController.java @@ -32,7 +32,7 @@ public class MenuInfoController { @PostMapping("/menus") @ApiOperation(value = "查询所有菜单列表") - public CommonResult> getAllMenus(@RequestBody Map map) { + public CommonResult getAllMenus(@RequestBody Map map) { return CommonResult.success(menuInfoService.selectAll(map)); } diff --git a/src/main/java/com/soft/line/controller/RoleInfoController.java b/src/main/java/com/soft/line/controller/RoleInfoController.java index 3029ca4..2717823 100644 --- a/src/main/java/com/soft/line/controller/RoleInfoController.java +++ b/src/main/java/com/soft/line/controller/RoleInfoController.java @@ -1,11 +1,8 @@ package com.soft.line.controller; -import com.github.pagehelper.PageInfo; -import com.soft.line.entity.RoleInfo; -import com.soft.line.entity.RoleMenuInfo; + import com.soft.line.service.RoleInfoService; import com.soft.line.util.exception.CommonResult; -import com.soft.line.util.exception.ResultData; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -26,7 +23,7 @@ public class RoleInfoController { @PostMapping("/roles") @ApiOperation(value = "获取所有角色列表") - public CommonResult>> getAllMenus(@RequestBody Map map) { + public CommonResult getAllMenus(@RequestBody Map map) { return CommonResult.success(roleInfoService.selectAllRoleMenuInfo(map)); } diff --git a/src/main/java/com/soft/line/entity/RoleMenuInfo.java b/src/main/java/com/soft/line/entity/RoleMenuInfo.java deleted file mode 100644 index 62f913f..0000000 --- a/src/main/java/com/soft/line/entity/RoleMenuInfo.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.soft.line.entity; - -import lombok.Data; - -import java.util.List; - -@Data -public class RoleMenuInfo { - public RoleInfo roleInfo; - public List menuInfoList; -} diff --git a/src/main/java/com/soft/line/mapper/RoleInfoMapper.java b/src/main/java/com/soft/line/mapper/RoleInfoMapper.java index 1c2b82c..ee4cff5 100644 --- a/src/main/java/com/soft/line/mapper/RoleInfoMapper.java +++ b/src/main/java/com/soft/line/mapper/RoleInfoMapper.java @@ -4,12 +4,13 @@ import com.soft.line.entity.RoleInfo; import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Map; public interface RoleInfoMapper { - int insert(RoleInfo roleInfo); + int insert(Map map); - int update(RoleInfo roleInfo); + int update(Map map); RoleInfo selectByPrimaryKey(Integer id); diff --git a/src/main/java/com/soft/line/mapper/RoleInfoMapper.xml b/src/main/java/com/soft/line/mapper/RoleInfoMapper.xml index cb0f28f..e695f08 100644 --- a/src/main/java/com/soft/line/mapper/RoleInfoMapper.xml +++ b/src/main/java/com/soft/line/mapper/RoleInfoMapper.xml @@ -10,12 +10,12 @@ - + insert into `role_info` (`name`,`state`,`modify_person`,`modify_time`) - values (#{name},#{state},#{modifyPerson},#{modifyTime}) + values (#{roleName},#{state},#{modifyPerson},#{modifyTime}) - + update `role_info` set `name` = #{roleName},`state` = #{state},`modify_person`=#{modifyPerson},`modify_time`=#{modifyTime} where `id` = #{id} diff --git a/src/main/java/com/soft/line/service/RoleInfoService.java b/src/main/java/com/soft/line/service/RoleInfoService.java index 8d0fa97..8bf11c7 100644 --- a/src/main/java/com/soft/line/service/RoleInfoService.java +++ b/src/main/java/com/soft/line/service/RoleInfoService.java @@ -2,7 +2,6 @@ package com.soft.line.service; import com.github.pagehelper.PageInfo; import com.soft.line.entity.RoleInfo; -import com.soft.line.entity.RoleMenuInfo; import java.util.List; import java.util.Map; @@ -10,7 +9,7 @@ import java.util.Map; public interface RoleInfoService { List selectAll(); - PageInfo> selectAllRoleMenuInfo(final Map map); + PageInfo>> selectAllRoleMenuInfo(final Map map); void delete(final Map map); diff --git a/src/main/java/com/soft/line/service/impl/RoleInfoServiceImpl.java b/src/main/java/com/soft/line/service/impl/RoleInfoServiceImpl.java index faf5524..5041198 100644 --- a/src/main/java/com/soft/line/service/impl/RoleInfoServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/RoleInfoServiceImpl.java @@ -1,9 +1,9 @@ package com.soft.line.service.impl; import com.github.pagehelper.PageInfo; +import com.soft.line.entity.ButtonInfo; import com.soft.line.entity.MenuInfo; import com.soft.line.entity.RoleInfo; -import com.soft.line.entity.RoleMenuInfo; import com.soft.line.mapper.ButtonInfoMapper; import com.soft.line.mapper.MenuInfoMapper; import com.soft.line.mapper.RoleInfoMapper; @@ -14,9 +14,8 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; +import java.util.*; +import java.util.stream.Collectors; @Slf4j @Service @@ -37,21 +36,28 @@ public class RoleInfoServiceImpl implements RoleInfoService { } @Override - public PageInfo> selectAllRoleMenuInfo(final Map map){ + public PageInfo>> selectAllRoleMenuInfo(Map map) { PageUtil.setPageParam(map); - List roleMenuInfos= new ArrayList(); + List> reultList = new ArrayList>(); for (RoleInfo roleInfo:roleInfoMapper.selectAll((String)map.get("roleName"))){ - RoleMenuInfo rmi = new RoleMenuInfo(); - rmi.setRoleInfo(roleInfo); - List menuInfos = menuInfoMapper.selectByRoleId(roleInfo.getId()); - for (MenuInfo menuInfo:menuInfos){ - menuInfo.setButtonInfoList(buttonInfoMapper.selectButtonsByRoleIdAndMenuId(roleInfo.getId(),menuInfo.getId())); + Map roleMap = new HashMap(); + roleMap.put("id",roleInfo.getId()); + roleMap.put("roleName",roleInfo.getName()); + roleMap.put("state",roleInfo.getState()); + List> menuList = new ArrayList>(); + for (MenuInfo menuInfo:menuInfoMapper.selectByRoleId(roleInfo.getId())){ + Map menuMap = new HashMap(); + menuMap.put("menuId",menuInfo.getId()); + menuMap.put("menuName",menuInfo.getMenuName()); + List buttonInfos=buttonInfoMapper.selectButtonsByRoleIdAndMenuId(roleInfo.getId(),menuInfo.getId()); + menuMap.put("buttonList",buttonInfos.stream().map(ButtonInfo->ButtonInfo.getButtonId()).collect(Collectors.toList())); + menuList.add(menuMap); } - rmi.setMenuInfoList(menuInfos); - roleMenuInfos.add(rmi); + roleMap.put("menuList",menuList); + reultList.add(roleMap); } - PageInfo> roleMenuInfoPage=new PageInfo(roleMenuInfos); - return roleMenuInfoPage; + PageInfo>> resultPage = new PageInfo(reultList); + return resultPage; } @Override @@ -70,7 +76,9 @@ public class RoleInfoServiceImpl implements RoleInfoService { public void add(Map map) { String roleName = (String)map.get("roleName"); String modifyPerson = "admin"; - roleInfoMapper.insert(roleName); + map.put("modifyPerson",modifyPerson); + map.put("modifyTime",new Date()); + roleInfoMapper.insert(map); RoleInfo roleInfo = roleInfoMapper.selectByRoleName(roleName); List> menuList=(List)map.get("menu"); for (Map mp:menuList){ @@ -85,7 +93,9 @@ public class RoleInfoServiceImpl implements RoleInfoService { public void update(Map map) { Integer roleId =(Integer)map.get("id"); String modifyPerson = "admin"; - roleInfoMapper.update(roleId,(String)map.get("roleName")); + map.put("modifyPerson",modifyPerson); + map.put("modifyTime",new Date()); + roleInfoMapper.update(map); roleMenuMapper.deleteByRoleId(roleId); List> menuList=(List)map.get("menu"); for (Map mp:menuList){ -- Gitee From 9e2b992cdf4aa721ede4cb8ce554609f7f3719fc Mon Sep 17 00:00:00 2001 From: ljc <1119265069@qq.com> Date: Mon, 1 Jun 2020 23:35:23 +0800 Subject: [PATCH 073/211] =?UTF-8?q?=E9=99=84=E4=BB=B6=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../line/controller/AttachmentController.java | 29 ++++++++++++++++++ .../util/config/ResourceConfigAdapter.java | 30 +++++++++++++++++++ src/main/resources/application.properties | 11 ++++++- 3 files changed, 69 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/soft/line/controller/AttachmentController.java create mode 100644 src/main/java/com/soft/line/util/config/ResourceConfigAdapter.java diff --git a/src/main/java/com/soft/line/controller/AttachmentController.java b/src/main/java/com/soft/line/controller/AttachmentController.java new file mode 100644 index 0000000..984e1cd --- /dev/null +++ b/src/main/java/com/soft/line/controller/AttachmentController.java @@ -0,0 +1,29 @@ +package com.soft.line.controller; + +import com.soft.line.util.exception.CommonResult; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.Map; + +@Api(description = "附件接口") +@Slf4j +@RestController +@RequestMapping("/attachment") +public class AttachmentController { + + @Value("${uploadFileDir}") + private String uploadFileDir; + + @ApiOperation(value = "获取所有证书列表", notes = "获取所有证书列表") + @PostMapping("/upload") + public CommonResult uploadDir(@RequestBody Map map){ + return CommonResult.success(uploadFileDir); + } +} diff --git a/src/main/java/com/soft/line/util/config/ResourceConfigAdapter.java b/src/main/java/com/soft/line/util/config/ResourceConfigAdapter.java new file mode 100644 index 0000000..84eeb7b --- /dev/null +++ b/src/main/java/com/soft/line/util/config/ResourceConfigAdapter.java @@ -0,0 +1,30 @@ +package com.soft.line.util.config; + +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport; + +/** + * 文件绝对地址与虚拟地址映射 + */ +@Configuration +public class ResourceConfigAdapter extends WebMvcConfigurationSupport { + @Value("${uploadFileDir}") + private String uploadFileDir; + @Value("${uploadFileMapping}") + private String uploadFileMapping; + + @Override + public void addResourceHandlers(ResourceHandlerRegistry registry) { + String os = System.getProperty("os.name"); + if (os.toLowerCase().startsWith("win")) { //如果是Windows系统 + registry.addResourceHandler(uploadFileMapping). + addResourceLocations("file:"+uploadFileDir); + }else{//linux和mac系统 + registry.addResourceHandler(uploadFileMapping). + addResourceLocations("file:/user/softline-files-manage-uploadFiles/"); + } + super.addResourceHandlers(registry); + } +} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index c5f6d96..bfb1e26 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -39,4 +39,13 @@ pagehelper.support-methods-arguments=true #mybatisӳļ· #mybatis.mapper-locations=com.soft.line.mapper/*.xml #ʵ· -mybatis.type-aliases-package=com.soft.line.entity \ No newline at end of file +mybatis.type-aliases-package=com.soft.line.entity + +#ļϴַ +#windows +uploadFileDir=D:/softline-files-manage-uploadFiles/ +#linux +#uploadFileDir=user/softline-files-manage-uploadFiles/ + +#ļϴӳַ +uploadFileMapping=uploadFiles/ \ No newline at end of file -- Gitee From 23e3699dcb70d9a4a705fd28a00ebb2637f09554 Mon Sep 17 00:00:00 2001 From: ljc <1119265069@qq.com> Date: Tue, 2 Jun 2020 00:26:02 +0800 Subject: [PATCH 074/211] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 3 +- .../controller/CertificateInfoController.java | 67 ++++++++++++++----- .../controller/ContractInfoController.java | 36 +++++++++- .../java/com/soft/line/util/poi/PoiUtils.java | 62 +++++++++++++++++ 4 files changed, 148 insertions(+), 20 deletions(-) diff --git a/pom.xml b/pom.xml index 6273194..5907926 100644 --- a/pom.xml +++ b/pom.xml @@ -185,9 +185,10 @@ org.apache.poi - poi + poi-ooxml 4.1.2 + diff --git a/src/main/java/com/soft/line/controller/CertificateInfoController.java b/src/main/java/com/soft/line/controller/CertificateInfoController.java index 584d430..a8ad69b 100644 --- a/src/main/java/com/soft/line/controller/CertificateInfoController.java +++ b/src/main/java/com/soft/line/controller/CertificateInfoController.java @@ -1,19 +1,32 @@ package com.soft.line.controller; +import com.soft.line.entity.CertificateInfo; import com.soft.line.service.CertificateInfoService; import com.soft.line.util.exception.CommonResult; import com.soft.line.util.exception.ResultData; import com.soft.line.util.jackson.converter.StringToDateUtil; +import com.soft.line.util.poi.PoiUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.apache.poi.hssf.usermodel.HSSFWorkbook; +import org.apache.poi.ss.usermodel.Row; +import org.apache.poi.ss.usermodel.Sheet; +import org.apache.poi.ss.usermodel.Workbook; +import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import javax.servlet.http.HttpServletRequest; +import java.io.IOException; +import java.io.InputStream; +import java.util.ArrayList; import java.util.Date; +import java.util.List; import java.util.Map; /** @@ -31,12 +44,10 @@ public class CertificateInfoController { private CertificateInfoService certificateInfoService; - /** - * @Description 证书查询 模糊查询 个人证书查询 分页 - * - * @param map 参数：pageSize，pageNum，查询条件：证书名称，人员姓名等 + * @param map 参数：pageSize，pageNum，查询条件：证书名称，人员姓名等 * @return + * @Description 证书查询 模糊查询 个人证书查询 分页 */ @ApiOperation(value = "证书列表", notes = "查询证书列表") //设置请求参数 @@ -45,47 +56,71 @@ public class CertificateInfoController { // @ApiImplicitParam(paramType = "query", name = "dicCode", value = "编码", required = false, dataType = "String") // ..... }) - // @Permission + // @Permission @PostMapping("/getCompanyAllCertificates") - public CommonResult getCompanyAllCertificates(@RequestBody Map map){ + public CommonResult getCompanyAllCertificates(@RequestBody Map map) { return CommonResult.success(certificateInfoService.getAllCompanyCertificates(map)); } @ApiOperation(value = "获取所有证书列表", notes = "获取所有证书列表") @PostMapping("/certificates") - public CommonResult getAllCertificates(@RequestBody Map map){ + public CommonResult getAllCertificates(@RequestBody Map map) { return CommonResult.success(certificateInfoService.getAllCertificates(map)); } @ApiOperation(value = "删除证书", notes = "删除证书") @DeleteMapping("/certificate") - public CommonResult deleteCertificate(@RequestBody Map map){ + public CommonResult deleteCertificate(@RequestBody Map map) { certificateInfoService.delete(map); return CommonResult.success("删除成功"); } @ApiOperation(value = "保存证书", notes = "保存证书") @PostMapping("/certificate") - public CommonResult saveCertificate(@RequestBody Map map){ - if (certificateInfoService.countByCName((Integer)map.get("id"),(String)map.get("certType"),(String)map.get("certName"))>0){ + public CommonResult saveCertificate(@RequestBody Map map) { + if (certificateInfoService.countByCName((Integer) map.get("id"), (String) map.get("certType"), (String) map.get("certName")) > 0) { return CommonResult.success("相同部门存在相同证书名称"); - }else if(certificateInfoService.countByCName((Integer)map.get("id"),(String)map.get("certType"),(String)map.get("certId"))>0){ + } else if (certificateInfoService.countByCName((Integer) map.get("id"), (String) map.get("certType"), (String) map.get("certId")) > 0) { return CommonResult.success("相同部门存在相同证书编号"); } - Date beginDate = StringToDateUtil.convert((String)map.get("beginDate")); - Date endDate =StringToDateUtil.convert((String)map.get("endDate")); - if (beginDate.after(endDate)){ + Date beginDate = StringToDateUtil.convert((String) map.get("beginDate")); + Date endDate = StringToDateUtil.convert((String) map.get("endDate")); + if (beginDate.after(endDate)) { return CommonResult.success("起始日期不能>终止日期"); } - if ((Integer)map.get("id")==null){ + if ((Integer) map.get("id") == null) { //添加 certificateInfoService.add(map); return CommonResult.success("添加成功"); - }else{ + } else { //修改 certificateInfoService.update(map); return CommonResult.success("修改成功"); } } + @ApiOperation(value = "导入证书", notes = "导入证书") + @PostMapping("/certificate/import") + public CommonResult importCertificate(@RequestParam MultipartFile file, HttpServletRequest request) { + if (file == null){ + return CommonResult.success("上传文件不能为空"); + } + String fileName = file.getOriginalFilename(); + if (!fileName.matches("^.+\\.(?i)(xls)$") && !fileName.matches("^.+\\.(?i)(xlsx)$")) { + return CommonResult.success("上传文件格式错误，请上传后缀为.xls或.xlsx的文件"); + } + PoiUtils poiUtils = new PoiUtils(); + List certificateInfoList = poiUtils.excel2Certificate(file); + return CommonResult.success("导入成功"); + } + + @ApiOperation(value = "导出证书", notes = "导出证书") + @PostMapping("/certificate/export") + public CommonResult exportCertificate(@RequestBody Map map) { + PoiUtils poiUtils = new PoiUtils(); + List certificateInfoList = new ArrayList(); + poiUtils.certificate2Excel(certificateInfoList); + return CommonResult.success("导出成功"); + } + } diff --git a/src/main/java/com/soft/line/controller/ContractInfoController.java b/src/main/java/com/soft/line/controller/ContractInfoController.java index 3e3fc76..bb557e6 100644 --- a/src/main/java/com/soft/line/controller/ContractInfoController.java +++ b/src/main/java/com/soft/line/controller/ContractInfoController.java @@ -1,16 +1,22 @@ package com.soft.line.controller; +import com.soft.line.entity.CertificateInfo; +import com.soft.line.entity.ContractInfo; import com.soft.line.service.ContractInfoService; import com.soft.line.util.exception.CommonResult; -import com.soft.line.util.exception.ResultData; import com.soft.line.util.jackson.converter.StringToDateUtil; +import com.soft.line.util.poi.PoiUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import javax.servlet.http.HttpServletRequest; +import java.util.ArrayList; import java.util.Date; +import java.util.List; import java.util.Map; /** @@ -40,14 +46,14 @@ public class ContractInfoController { @ApiOperation(value = "删除证书", notes = "删除证书") @DeleteMapping("/contract") - public CommonResult deleteCertificate(@RequestBody Map map){ + public CommonResult deleteContract(@RequestBody Map map){ contractInfoService.delete(map); return CommonResult.success("删除成功"); } @ApiOperation(value = "保存合同", notes = "保存合同") @PostMapping("/contract") - public CommonResult saveCertificate(@RequestBody Map map){ + public CommonResult saveContract(@RequestBody Map map){ if (contractInfoService.countContractByIdAndDeptAndTypeAndName((Integer)map.get("id"),(String)map.get("depId"), (String)map.get("proId"),(String)map.get("contractName"))>1){ return CommonResult.success("相同部门相同项目类型下存在相同合同名称"); @@ -73,4 +79,28 @@ public class ContractInfoController { } } + @ApiOperation(value = "导入合同", notes = "导入合同") + @PostMapping("/contract/import") + public CommonResult importContract(@RequestParam MultipartFile file, HttpServletRequest request) { + if (file == null){ + return CommonResult.success("上传文件不能为空"); + } + String fileName = file.getOriginalFilename(); + if (!fileName.matches("^.+\\.(?i)(xls)$") && !fileName.matches("^.+\\.(?i)(xlsx)$")) { + return CommonResult.success("上传文件格式错误，请上传后缀为.xls或.xlsx的文件"); + } + PoiUtils poiUtils = new PoiUtils(); + List contractInfoList = poiUtils.excel2ContractInfo(file); + return CommonResult.success("导入成功"); + } + + @ApiOperation(value = "导出合同", notes = "导出合同") + @PostMapping("/contract/export") + public CommonResult exportContract(@RequestBody Map map) { + PoiUtils poiUtils = new PoiUtils(); + List contractInfoList = new ArrayList(); + poiUtils.contract2Excel(contractInfoList); + return CommonResult.success("导出成功"); + } + } diff --git a/src/main/java/com/soft/line/util/poi/PoiUtils.java b/src/main/java/com/soft/line/util/poi/PoiUtils.java index 4583713..46c0bc7 100644 --- a/src/main/java/com/soft/line/util/poi/PoiUtils.java +++ b/src/main/java/com/soft/line/util/poi/PoiUtils.java @@ -2,8 +2,15 @@ package com.soft.line.util.poi; import com.soft.line.entity.CertificateInfo; import com.soft.line.entity.ContractInfo; +import org.apache.poi.hssf.usermodel.HSSFWorkbook; +import org.apache.poi.ss.usermodel.Row; +import org.apache.poi.ss.usermodel.Sheet; +import org.apache.poi.ss.usermodel.Workbook; +import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.springframework.web.multipart.MultipartFile; +import java.io.IOException; +import java.io.InputStream; import java.util.ArrayList; import java.util.List; @@ -19,11 +26,66 @@ public class PoiUtils { public List excel2Certificate(MultipartFile file){ List certificateInfoList = new ArrayList(); + try{ + String fileName = file.getOriginalFilename(); + boolean isExcel2003 = true; + if (fileName.matches("^.+\\.(?i)(xlsx)$")) { + isExcel2003 = false; + } + InputStream is = file.getInputStream(); + Workbook wb = null; + if (isExcel2003) { + wb = new HSSFWorkbook(is); + } else { + wb = new XSSFWorkbook(is); + } + Sheet sheet = wb.getSheetAt(0); + if (sheet != null) { + //notNull = true; + } + for (int r = 1; r <= sheet.getLastRowNum(); r++) { + Row row = sheet.getRow(r); + if (row == null) { + continue; + } + System.out.println(row.getCell(0).getStringCellValue()); + } + }catch (IOException e){ + + } + return certificateInfoList; } public List excel2ContractInfo(MultipartFile file){ List contractInfoList = new ArrayList(); + try{ + String fileName = file.getOriginalFilename(); + boolean isExcel2003 = true; + if (fileName.matches("^.+\\.(?i)(xlsx)$")) { + isExcel2003 = false; + } + InputStream is = file.getInputStream(); + Workbook wb = null; + if (isExcel2003) { + wb = new HSSFWorkbook(is); + } else { + wb = new XSSFWorkbook(is); + } + Sheet sheet = wb.getSheetAt(0); + if (sheet != null) { + //notNull = true; + } + for (int r = 1; r <= sheet.getLastRowNum(); r++) { + Row row = sheet.getRow(r); + if (row == null) { + continue; + } + System.out.println(row.getCell(0).getStringCellValue()); + } + }catch (IOException e){ + + } return contractInfoList; } } -- Gitee From fba141a0738ede77039e59d6e37385a232efdb3b Mon Sep 17 00:00:00 2001 From: wuxueqiao <17625808004@163.com> Date: Tue, 2 Jun 2020 14:10:39 +0800 Subject: [PATCH 075/211] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E4=BF=AE=E6=94=B92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- softline-files-manage.iml | 3 +-- .../line/service/impl/LoginServiceImpl.java | 24 ++++++++++--------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/softline-files-manage.iml b/softline-files-manage.iml index 483cf86..81b80cb 100644 --- a/softline-files-manage.iml +++ b/softline-files-manage.iml @@ -25,7 +25,6 @@ - @@ -125,7 +124,6 @@ - @@ -152,6 +150,7 @@ + diff --git a/src/main/java/com/soft/line/service/impl/LoginServiceImpl.java b/src/main/java/com/soft/line/service/impl/LoginServiceImpl.java index 4d21f14..e1caf35 100644 --- a/src/main/java/com/soft/line/service/impl/LoginServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/LoginServiceImpl.java @@ -78,7 +78,7 @@ public class LoginServiceImpl implements LoginService { - public String returnToken(final UserTokenDto user) { + private String returnToken(final UserTokenDto user) { if (redisClient.getKeyValue(user.getUserInfo().getUserName()) == null || "".equals(redisClient.getKeyValue(user.getUserInfo().getUserName()))) { final Map claims = new HashMap<>(); claims.put("password", user.getUserInfo().getPassword()); @@ -108,9 +108,7 @@ public class LoginServiceImpl implements LoginService { System.out.println("获取openId失败！"); return AjaxResult.error("获取微信信息失败，请稍后再试！"); } - UserInfo userInfo = userInfoMapper.getUserInfoByOpenId(openId); - //用户已经绑定过openId 则签发token 以及返回userInfo if (userInfo!=null) { try { @@ -182,7 +180,7 @@ public class LoginServiceImpl implements LoginService { } @Override - @Transactional + @Transactional(rollbackFor=Exception.class) public AjaxResult getUserInfo(Map map) { UserTokenDto userTokenDto= HttpRequestUtil.getUserToken(); int id=userTokenDto.getUserInfo().getId(); @@ -193,13 +191,17 @@ public class LoginServiceImpl implements LoginService { System.out.println("获取openId失败！"); return AjaxResult.error("获取微信信息失败，请稍后再试！"); } - UserInfo userInfo = userInfoMapper.getUserInfoByOpenId(openId); - //有token又没有根据此openId查出用户 说明openId变了 此时根据用户id查询绑定用户openId - if(userInfo==null) { - userInfoMapper.updateOpenIdById(openId, id); - userInfo = userInfoMapper.getUserInfoByOpenId(openId); + try { + UserInfo userInfo = userInfoMapper.getUserInfoByOpenId(openId); + //有token又没有根据此openId查出用户 说明openId变了 此时根据用户id查询绑定用户openId + if(userInfo==null) { + userInfoMapper.updateOpenIdById(openId, id); + userInfo = userInfoMapper.getUserInfoByOpenId(openId); + return AjaxResult.success(userInfo); + } + }catch (Exception e){ + e.printStackTrace(); } - - return AjaxResult.success(userInfo); + return AjaxResult.error(); } } -- Gitee From 8c513bf9761fd398f386ccd6adb48392a072c175 Mon Sep 17 00:00:00 2001 From: ljc Date: Tue, 2 Jun 2020 14:23:44 +0800 Subject: [PATCH 076/211] =?UTF-8?q?=E8=A7=92=E8=89=B2=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/soft/line/service/impl/RoleInfoServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/soft/line/service/impl/RoleInfoServiceImpl.java b/src/main/java/com/soft/line/service/impl/RoleInfoServiceImpl.java index 5041198..d2ea6a3 100644 --- a/src/main/java/com/soft/line/service/impl/RoleInfoServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/RoleInfoServiceImpl.java @@ -50,7 +50,7 @@ public class RoleInfoServiceImpl implements RoleInfoService { menuMap.put("menuId",menuInfo.getId()); menuMap.put("menuName",menuInfo.getMenuName()); List buttonInfos=buttonInfoMapper.selectButtonsByRoleIdAndMenuId(roleInfo.getId(),menuInfo.getId()); - menuMap.put("buttonList",buttonInfos.stream().map(ButtonInfo->ButtonInfo.getButtonId()).collect(Collectors.toList())); + menuMap.put("buttonList",buttonInfos); menuList.add(menuMap); } roleMap.put("menuList",menuList); -- Gitee From 62bf79d2e0154b8fbc6a30c328c4fbf5ce6bf4f6 Mon Sep 17 00:00:00 2001 From: ljc Date: Tue, 2 Jun 2020 14:40:22 +0800 Subject: [PATCH 077/211] =?UTF-8?q?=E8=AF=81=E4=B9=A6=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../soft/line/controller/CertificateInfoController.java | 7 ++++--- .../java/com/soft/line/mapper/CertificateInfoMapper.java | 2 ++ .../java/com/soft/line/mapper/CertificateInfoMapper.xml | 8 ++++++++ .../com/soft/line/service/CertificateInfoService.java | 2 ++ .../line/service/impl/CertificateInfoServiceImpl.java | 7 +++++++ 5 files changed, 23 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/soft/line/controller/CertificateInfoController.java b/src/main/java/com/soft/line/controller/CertificateInfoController.java index a8ad69b..f51714b 100644 --- a/src/main/java/com/soft/line/controller/CertificateInfoController.java +++ b/src/main/java/com/soft/line/controller/CertificateInfoController.java @@ -80,7 +80,7 @@ public class CertificateInfoController { public CommonResult saveCertificate(@RequestBody Map map) { if (certificateInfoService.countByCName((Integer) map.get("id"), (String) map.get("certType"), (String) map.get("certName")) > 0) { return CommonResult.success("相同部门存在相同证书名称"); - } else if (certificateInfoService.countByCName((Integer) map.get("id"), (String) map.get("certType"), (String) map.get("certId")) > 0) { + } else if (certificateInfoService.countByCId((Integer) map.get("id"), (String) map.get("certType"), (String) map.get("certId")) > 0) { return CommonResult.success("相同部门存在相同证书编号"); } Date beginDate = StringToDateUtil.convert((String) map.get("beginDate")); @@ -118,9 +118,10 @@ public class CertificateInfoController { @PostMapping("/certificate/export") public CommonResult exportCertificate(@RequestBody Map map) { PoiUtils poiUtils = new PoiUtils(); - List certificateInfoList = new ArrayList(); + List certificateInfoList = certificateInfoService.getAllByIDList(map); poiUtils.certificate2Excel(certificateInfoList); - return CommonResult.success("导出成功"); + //return CommonResult.success("导出成功"); + return CommonResult.success(certificateInfoList); } } diff --git a/src/main/java/com/soft/line/mapper/CertificateInfoMapper.java b/src/main/java/com/soft/line/mapper/CertificateInfoMapper.java index 6d35484..c56a81d 100644 --- a/src/main/java/com/soft/line/mapper/CertificateInfoMapper.java +++ b/src/main/java/com/soft/line/mapper/CertificateInfoMapper.java @@ -28,4 +28,6 @@ public interface CertificateInfoMapper { int countCertificateByIdAndTypeAndName(@Param("id")Integer id,@Param("certType")String certType,@Param("certName")String certName); int countCertificateByIdAndTypeAndCId(@Param("id")Integer id,@Param("certType")String certType,@Param("certId")String certId); + + List getAllByIdList(List idList); } \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/CertificateInfoMapper.xml b/src/main/java/com/soft/line/mapper/CertificateInfoMapper.xml index 5b4015e..97d2a52 100644 --- a/src/main/java/com/soft/line/mapper/CertificateInfoMapper.xml +++ b/src/main/java/com/soft/line/mapper/CertificateInfoMapper.xml @@ -110,4 +110,12 @@ and `id` ]]> #{id,jdbcType=INTEGER} + + \ No newline at end of file diff --git a/src/main/java/com/soft/line/service/CertificateInfoService.java b/src/main/java/com/soft/line/service/CertificateInfoService.java index 16a2b0a..128b9e8 100644 --- a/src/main/java/com/soft/line/service/CertificateInfoService.java +++ b/src/main/java/com/soft/line/service/CertificateInfoService.java @@ -28,4 +28,6 @@ public interface CertificateInfoService { public int countByCName(Integer id,String cType,String cName); public int countByCId(Integer id,String cType,String cId); + + public List getAllByIDList(Map map); } diff --git a/src/main/java/com/soft/line/service/impl/CertificateInfoServiceImpl.java b/src/main/java/com/soft/line/service/impl/CertificateInfoServiceImpl.java index bcebaad..2cda990 100644 --- a/src/main/java/com/soft/line/service/impl/CertificateInfoServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/CertificateInfoServiceImpl.java @@ -9,6 +9,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Map; @@ -73,4 +74,10 @@ public class CertificateInfoServiceImpl implements CertificateInfoService { map.put("modifyTime",new Date()); certificateInfoMapper.update(map); } + + @Override + public List getAllByIDList(Map map) { + List list = certificateInfoMapper.getAllByIdList((List) map.get("idList")); + return list; + } } -- Gitee From 569a04f2a8e28bb97ca8d259e7e5748f4934d036 Mon Sep 17 00:00:00 2001 From: ljc Date: Tue, 2 Jun 2020 17:01:23 +0800 Subject: [PATCH 078/211] =?UTF-8?q?=E8=AF=81=E4=B9=A6=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/soft/line/entity/AttachmentInfo.java | 3 +++ .../com/soft/line/entity/CertificateInfo.java | 7 +++++++ .../com/soft/line/entity/ContractInfo.java | 6 ++++++ .../com/soft/line/entity/MenuButtonInfo.java | 3 +++ .../java/com/soft/line/entity/MenuInfo.java | 3 +++ .../java/com/soft/line/entity/RoleInfo.java | 3 +++ .../java/com/soft/line/entity/RoleMenu.java | 3 +++ .../line/mapper/CertificateInfoMapper.java | 2 +- .../soft/line/mapper/CertificateInfoMapper.xml | 8 ++++++++ .../java/com/soft/line/util/poi/PoiUtils.java | 18 ++++++++++++++---- 10 files changed, 51 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/soft/line/entity/AttachmentInfo.java b/src/main/java/com/soft/line/entity/AttachmentInfo.java index 8147be7..d39d8b9 100644 --- a/src/main/java/com/soft/line/entity/AttachmentInfo.java +++ b/src/main/java/com/soft/line/entity/AttachmentInfo.java @@ -1,5 +1,7 @@ package com.soft.line.entity; +import com.fasterxml.jackson.annotation.JsonFormat; + import java.util.Date; public class AttachmentInfo { @@ -41,6 +43,7 @@ public class AttachmentInfo { * * @mbggenerated */ + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "Asia/Shanghai") private Date modifyTime; /** diff --git a/src/main/java/com/soft/line/entity/CertificateInfo.java b/src/main/java/com/soft/line/entity/CertificateInfo.java index 8bed301..a61467b 100644 --- a/src/main/java/com/soft/line/entity/CertificateInfo.java +++ b/src/main/java/com/soft/line/entity/CertificateInfo.java @@ -1,8 +1,12 @@ package com.soft.line.entity; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonInclude; + import javax.validation.constraints.NotNull; import java.util.Date; +//@JsonInclude(JsonInclude.Include.NON_NULL) public class CertificateInfo { /** * This field was generated by MyBatis Generator. @@ -55,6 +59,7 @@ public class CertificateInfo { * @mbggenerated */ @NotNull + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "Asia/Shanghai") private Date beginDate; /** @@ -63,6 +68,7 @@ public class CertificateInfo { * * @mbggenerated */ + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "Asia/Shanghai") private Date endDate; /** @@ -87,6 +93,7 @@ public class CertificateInfo { * * @mbggenerated */ + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "Asia/Shanghai") private Date modifyTime; /** diff --git a/src/main/java/com/soft/line/entity/ContractInfo.java b/src/main/java/com/soft/line/entity/ContractInfo.java index 3b8b555..66a0c08 100644 --- a/src/main/java/com/soft/line/entity/ContractInfo.java +++ b/src/main/java/com/soft/line/entity/ContractInfo.java @@ -1,5 +1,7 @@ package com.soft.line.entity; +import com.fasterxml.jackson.annotation.JsonFormat; + import java.math.BigDecimal; import java.util.Date; @@ -66,6 +68,7 @@ public class ContractInfo { * * @mbggenerated */ + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "Asia/Shanghai") private Date signTime; /** @@ -82,6 +85,7 @@ public class ContractInfo { * * @mbggenerated */ + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "Asia/Shanghai") private Date beginDate; /** @@ -90,6 +94,7 @@ public class ContractInfo { * * @mbggenerated */ + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "Asia/Shanghai") private Date endDate; /** @@ -122,6 +127,7 @@ public class ContractInfo { * * @mbggenerated */ + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "Asia/Shanghai") private Date modifyTime; /** diff --git a/src/main/java/com/soft/line/entity/MenuButtonInfo.java b/src/main/java/com/soft/line/entity/MenuButtonInfo.java index a43c560..b8e1a2f 100644 --- a/src/main/java/com/soft/line/entity/MenuButtonInfo.java +++ b/src/main/java/com/soft/line/entity/MenuButtonInfo.java @@ -1,5 +1,7 @@ package com.soft.line.entity; +import com.fasterxml.jackson.annotation.JsonFormat; + import java.util.Date; public class MenuButtonInfo { @@ -41,6 +43,7 @@ public class MenuButtonInfo { * * @mbggenerated */ + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "Asia/Shanghai") private Date modifyTime; /** diff --git a/src/main/java/com/soft/line/entity/MenuInfo.java b/src/main/java/com/soft/line/entity/MenuInfo.java index 48faddd..81ca2ce 100644 --- a/src/main/java/com/soft/line/entity/MenuInfo.java +++ b/src/main/java/com/soft/line/entity/MenuInfo.java @@ -1,5 +1,7 @@ package com.soft.line.entity; +import com.fasterxml.jackson.annotation.JsonFormat; + import java.util.Date; import java.util.List; @@ -74,6 +76,7 @@ public class MenuInfo { * * @mbggenerated */ + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "Asia/Shanghai") private Date modifyTime; private List buttonInfoList; diff --git a/src/main/java/com/soft/line/entity/RoleInfo.java b/src/main/java/com/soft/line/entity/RoleInfo.java index 8258af2..ff17731 100644 --- a/src/main/java/com/soft/line/entity/RoleInfo.java +++ b/src/main/java/com/soft/line/entity/RoleInfo.java @@ -1,5 +1,7 @@ package com.soft.line.entity; +import com.fasterxml.jackson.annotation.JsonFormat; + import java.util.Date; public class RoleInfo { @@ -12,6 +14,7 @@ public class RoleInfo { private String modifyPerson; + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "Asia/Shanghai") private Date modifyTime; diff --git a/src/main/java/com/soft/line/entity/RoleMenu.java b/src/main/java/com/soft/line/entity/RoleMenu.java index a5df72c..37bbf15 100644 --- a/src/main/java/com/soft/line/entity/RoleMenu.java +++ b/src/main/java/com/soft/line/entity/RoleMenu.java @@ -1,5 +1,7 @@ package com.soft.line.entity; +import com.fasterxml.jackson.annotation.JsonFormat; + import java.util.Date; public class RoleMenu { @@ -41,6 +43,7 @@ public class RoleMenu { * * @mbggenerated */ + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "Asia/Shanghai") private Date modifyTime; /** diff --git a/src/main/java/com/soft/line/mapper/CertificateInfoMapper.java b/src/main/java/com/soft/line/mapper/CertificateInfoMapper.java index c56a81d..9887e9c 100644 --- a/src/main/java/com/soft/line/mapper/CertificateInfoMapper.java +++ b/src/main/java/com/soft/line/mapper/CertificateInfoMapper.java @@ -29,5 +29,5 @@ public interface CertificateInfoMapper { int countCertificateByIdAndTypeAndCId(@Param("id")Integer id,@Param("certType")String certType,@Param("certId")String certId); - List getAllByIdList(List idList); + List getAllByIdList(@Param("idList")List idList); } \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/CertificateInfoMapper.xml b/src/main/java/com/soft/line/mapper/CertificateInfoMapper.xml index 97d2a52..ab6b2b7 100644 --- a/src/main/java/com/soft/line/mapper/CertificateInfoMapper.xml +++ b/src/main/java/com/soft/line/mapper/CertificateInfoMapper.xml @@ -117,5 +117,13 @@ `cert_name`, `cert_unit`, `begin_date`, `end_date`, `note`, `modify_person`, `modify_time`, `del_flg` from `certificate_info` + + + and `id` in + + #{id} + + + \ No newline at end of file diff --git a/src/main/java/com/soft/line/util/poi/PoiUtils.java b/src/main/java/com/soft/line/util/poi/PoiUtils.java index 46c0bc7..5f12cb8 100644 --- a/src/main/java/com/soft/line/util/poi/PoiUtils.java +++ b/src/main/java/com/soft/line/util/poi/PoiUtils.java @@ -2,10 +2,11 @@ package com.soft.line.util.poi; import com.soft.line.entity.CertificateInfo; import com.soft.line.entity.ContractInfo; +import org.apache.poi.hssf.usermodel.HSSFCellStyle; +import org.apache.poi.hssf.usermodel.HSSFDataFormat; +import org.apache.poi.hssf.usermodel.HSSFSheet; import org.apache.poi.hssf.usermodel.HSSFWorkbook; -import org.apache.poi.ss.usermodel.Row; -import org.apache.poi.ss.usermodel.Sheet; -import org.apache.poi.ss.usermodel.Workbook; +import org.apache.poi.ss.usermodel.*; import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.springframework.web.multipart.MultipartFile; @@ -17,7 +18,16 @@ import java.util.List; public class PoiUtils { public void certificate2Excel(List list){ - + //创建一个 Excel 文档 + HSSFWorkbook workbook = new HSSFWorkbook(); + //5. 创建样式 + //创建标题行的样式 + HSSFCellStyle headerStyle = workbook.createCellStyle(); + headerStyle.setFillForegroundColor(IndexedColors.YELLOW.index); + headerStyle.setFillPattern(FillPatternType.SOLID_FOREGROUND); + HSSFCellStyle dateCellStyle = workbook.createCellStyle(); + dateCellStyle.setDataFormat(HSSFDataFormat.getBuiltinFormat("yyyy/mm/dd")); + HSSFSheet sheet = workbook.createSheet("证书信息表"); } public void contract2Excel(List list){ -- Gitee From 8ff41839d75a6ea3977d81921ce5887e64f04f03 Mon Sep 17 00:00:00 2001 From: ljc <1119265069@qq.com> Date: Wed, 3 Jun 2020 01:11:31 +0800 Subject: [PATCH 079/211] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- softline-files-manage.iml | 7 ++- .../java/com/soft/line/util/poi/PoiUtils.java | 55 +++++++++++++++++-- 2 files changed, 57 insertions(+), 5 deletions(-) diff --git a/softline-files-manage.iml b/softline-files-manage.iml index 81b80cb..3162b08 100644 --- a/softline-files-manage.iml +++ b/softline-files-manage.iml @@ -124,6 +124,7 @@ + @@ -173,9 +174,13 @@ + - + + + + \ No newline at end of file diff --git a/src/main/java/com/soft/line/util/poi/PoiUtils.java b/src/main/java/com/soft/line/util/poi/PoiUtils.java index 5f12cb8..72c715e 100644 --- a/src/main/java/com/soft/line/util/poi/PoiUtils.java +++ b/src/main/java/com/soft/line/util/poi/PoiUtils.java @@ -2,14 +2,14 @@ package com.soft.line.util.poi; import com.soft.line.entity.CertificateInfo; import com.soft.line.entity.ContractInfo; -import org.apache.poi.hssf.usermodel.HSSFCellStyle; -import org.apache.poi.hssf.usermodel.HSSFDataFormat; -import org.apache.poi.hssf.usermodel.HSSFSheet; -import org.apache.poi.hssf.usermodel.HSSFWorkbook; +import org.apache.poi.hssf.usermodel.*; import org.apache.poi.ss.usermodel.*; import org.apache.poi.xssf.usermodel.XSSFWorkbook; +import org.springframework.http.HttpHeaders; +import org.springframework.http.MediaType; import org.springframework.web.multipart.MultipartFile; +import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; import java.util.ArrayList; @@ -28,6 +28,53 @@ public class PoiUtils { HSSFCellStyle dateCellStyle = workbook.createCellStyle(); dateCellStyle.setDataFormat(HSSFDataFormat.getBuiltinFormat("yyyy/mm/dd")); HSSFSheet sheet = workbook.createSheet("证书信息表"); + //创建标题行 + HSSFRow r0 = sheet.createRow(0); + HSSFCell c0 = r0.createCell(0); + c0.setCellValue("证书编号"); + c0.setCellStyle(headerStyle); + HSSFCell c1 = r0.createCell(1); + c1.setCellStyle(headerStyle); + c1.setCellValue("证书类型"); + HSSFCell c2 = r0.createCell(2); + c2.setCellStyle(headerStyle); + c2.setCellValue("证书名称"); + HSSFCell c3 = r0.createCell(3); + c3.setCellStyle(headerStyle); + c3.setCellValue("颁奖单位"); + HSSFCell c4 = r0.createCell(4); + c4.setCellStyle(headerStyle); + c4.setCellValue("起始日期"); + HSSFCell c5 = r0.createCell(5); + c5.setCellStyle(headerStyle); + c5.setCellValue("终止日期"); + HSSFCell c6 = r0.createCell(6); + c6.setCellStyle(headerStyle); + c6.setCellValue("备注"); + for(int i = 0; i < list.size(); i++){ + CertificateInfo cert =list.get(i); + HSSFRow row = sheet.createRow(i + 1); + row.createCell(0).setCellValue(cert.getCertId()); + row.createCell(1).setCellValue(cert.getCertType()); + row.createCell(2).setCellValue(cert.getCertName()); + row.createCell(3).setCellValue(cert.getCertUnit()); + HSSFCell cell4 = row.createCell(4); + cell4.setCellStyle(dateCellStyle); + cell4.setCellValue(cert.getBeginDate()); + HSSFCell cell5 =row.createCell(5); + cell5.setCellStyle(dateCellStyle); + cell5.setCellValue(cert.getEndDate()); + row.createCell(6).setCellValue(cert.getNote()); + } + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + HttpHeaders headers = new HttpHeaders(); + try { + headers.setContentDispositionFormData("attachment", new String("证书信息表.xls".getBytes("UTF-8"), "ISO-8859-1")); + headers.setContentType(MediaType.APPLICATION_OCTET_STREAM); + workbook.write(baos); + } catch (IOException e) { + e.printStackTrace(); + } } public void contract2Excel(List list){ -- Gitee From 6ad900b3c040652367242a48f996a7b9dffdecd4 Mon Sep 17 00:00:00 2001 From: wuxueqiao <17625808004@163.com> Date: Wed, 3 Jun 2020 14:09:41 +0800 Subject: [PATCH 080/211] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../line/controller/UserInfoController.java | 6 +-- .../com/soft/line/mapper/UserInfoMapper.java | 38 +++++++++++++++++++ .../com/soft/line/mapper/UserInfoMapper.xml | 14 ++++++- 3 files changed, 53 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/soft/line/controller/UserInfoController.java b/src/main/java/com/soft/line/controller/UserInfoController.java index b045239..0fd6ae4 100644 --- a/src/main/java/com/soft/line/controller/UserInfoController.java +++ b/src/main/java/com/soft/line/controller/UserInfoController.java @@ -59,7 +59,7 @@ public class UserInfoController { /** * @Permission * @Des 权限判定该 删除操作者 是否具有该权限 - * @param id + * @param map * @return */ @ApiOperation(value = "删除用户", notes = "删除用户") @@ -68,8 +68,8 @@ public class UserInfoController { }) @Permission @DeleteMapping("/account") - public CommonResult delUser(@RequestParam("id") int id){ - int result=userInfoService.delUser(id); + public CommonResult delUser(@RequestBody Map map){ + int result=userInfoService.delUser(Integer.valueOf(map.get("id").toString())); if(result==1){ return CommonResult.success("删除成功"); }else { diff --git a/src/main/java/com/soft/line/mapper/UserInfoMapper.java b/src/main/java/com/soft/line/mapper/UserInfoMapper.java index 629bb3e..d8720bd 100644 --- a/src/main/java/com/soft/line/mapper/UserInfoMapper.java +++ b/src/main/java/com/soft/line/mapper/UserInfoMapper.java @@ -30,17 +30,55 @@ public interface UserInfoMapper { */ List selectAll(); + /** + * 根据登录信息，获取用户 + * @param map + * @return + */ UserInfo userLogin(Map map); + /** + * 模糊查询 + * @param map + * @return + */ List getAllUsers(Map map); + /** + * 根据id删除用户 + * @param id + * @return + */ int delUser(int id); + /** + * 修改人员信息 + * @param userInfo + * @return + */ int updateUserInfo(UserInfo userInfo); + /** + * 根据openId 获取人员信息 + * @param openId + * @return + */ UserInfo getUserInfoByOpenId(String openId); + /** + * 获取人员信息 + * @param phone + * @param userName + * @param password + * @return + */ UserInfo getUserInfoByPhoneAndUserNameAndPassword(String phone, String userName, String password); + /** + * 根据id 修改人员的openId + * @param openId + * @param id + * @return + */ int updateOpenIdById(String openId, int id); } \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/UserInfoMapper.xml b/src/main/java/com/soft/line/mapper/UserInfoMapper.xml index 78996d5..f48e60d 100644 --- a/src/main/java/com/soft/line/mapper/UserInfoMapper.xml +++ b/src/main/java/com/soft/line/mapper/UserInfoMapper.xml @@ -28,7 +28,7 @@ `user_status`, `role_id`, `salt`, `open_id`) values (#{userName,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR}, #{phone,jdbcType=VARCHAR}, - #{modifyPerson,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}, #{headImgUrl,jdbcType=VARCHAR}, + 'admin', #{modifyTime,jdbcType=TIMESTAMP}, #{headImgUrl,jdbcType=VARCHAR}, #{userStatus,jdbcType=VARCHAR}, #{roleId,jdbcType=INTEGER}, #{salt,jdbcType=VARCHAR}, #{openId,jdbcType=VARCHAR}) @@ -66,9 +66,19 @@ `password`=#{password,jdbcType=VARCHAR} UPDATE `user_info` -- Gitee From cf4abda3fcfabdc0ade74d319625d4575fd9ab28 Mon Sep 17 00:00:00 2001 From: wuxueqiao <17625808004@163.com> Date: Wed, 3 Jun 2020 14:48:18 +0800 Subject: [PATCH 081/211] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E4=BF=AE=E6=94=B91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../line/controller/UserInfoController.java | 2 +- .../com/soft/line/mapper/UserInfoMapper.xml | 23 +++++++++---------- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/soft/line/controller/UserInfoController.java b/src/main/java/com/soft/line/controller/UserInfoController.java index 0fd6ae4..67905a3 100644 --- a/src/main/java/com/soft/line/controller/UserInfoController.java +++ b/src/main/java/com/soft/line/controller/UserInfoController.java @@ -66,7 +66,7 @@ public class UserInfoController { @ApiImplicitParams({ @ApiImplicitParam(paramType = "query", name = "id", value = "userId", required = true, dataType = "java.lang.Integer"), }) - @Permission + //@Permission @DeleteMapping("/account") public CommonResult delUser(@RequestBody Map map){ int result=userInfoService.delUser(Integer.valueOf(map.get("id").toString())); diff --git a/src/main/java/com/soft/line/mapper/UserInfoMapper.xml b/src/main/java/com/soft/line/mapper/UserInfoMapper.xml index f48e60d..237dd9a 100644 --- a/src/main/java/com/soft/line/mapper/UserInfoMapper.xml +++ b/src/main/java/com/soft/line/mapper/UserInfoMapper.xml @@ -28,7 +28,7 @@ `user_status`, `role_id`, `salt`, `open_id`) values (#{userName,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR}, #{phone,jdbcType=VARCHAR}, - 'admin', #{modifyTime,jdbcType=TIMESTAMP}, #{headImgUrl,jdbcType=VARCHAR}, + 'admin', now(), #{headImgUrl,jdbcType=VARCHAR}, #{userStatus,jdbcType=VARCHAR}, #{roleId,jdbcType=INTEGER}, #{salt,jdbcType=VARCHAR}, #{openId,jdbcType=VARCHAR}) @@ -80,24 +80,23 @@ AND `user_status`=#{userStatus,jdbcType=INTEGER} - - UPDATE `user_info` - SET `user_status`=2 + + DELETE FROM `user_info` WHERE `id`=#{id,jdbcType=INTEGER} - + UPDATE `user_info` - `user_name`=#{userName,jdbcType=VARCHAR} - `password`=#{password,jdbcType=VARCHAR} - `phone`=#{phone,jdbcType=VARCHAR} - `modify_person`=#{modifyPerson,jdbcType=VARCHAR} - `head_img_url`=#{headImgUrl,jdbcType=VARCHAR} - `user_status`=#{userStatus,jdbcType=VARCHAR} + `user_name`=#{userName,jdbcType=VARCHAR}, + `password`=#{password,jdbcType=VARCHAR}, + `phone`=#{phone,jdbcType=VARCHAR}, + `modify_person`=#{modifyPerson,jdbcType=VARCHAR}, + `head_img_url`=#{headImgUrl,jdbcType=VARCHAR}, + `user_status`=#{userStatus,jdbcType=VARCHAR}, `role_id`=#{roleId,jdbcType=INTEGER} - WHERE `id`=#{id,jdbdType=INTEGER} + WHERE `id`=#{id,jdbcType=INTEGER} + + + \ No newline at end of file diff --git a/src/main/java/com/soft/line/service/ContractInfoService.java b/src/main/java/com/soft/line/service/ContractInfoService.java index ce10a8f..d76ceaa 100644 --- a/src/main/java/com/soft/line/service/ContractInfoService.java +++ b/src/main/java/com/soft/line/service/ContractInfoService.java @@ -25,4 +25,6 @@ public interface ContractInfoService { public void update(Map map); public int countContractByIdAndDeptAndTypeAndName(Integer id,String deptId,String proId,String contractName); + + public List getAllByIDList(Map map) ; } diff --git a/src/main/java/com/soft/line/service/impl/CertificateInfoServiceImpl.java b/src/main/java/com/soft/line/service/impl/CertificateInfoServiceImpl.java index 2cda990..c9f3403 100644 --- a/src/main/java/com/soft/line/service/impl/CertificateInfoServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/CertificateInfoServiceImpl.java @@ -77,7 +77,7 @@ public class CertificateInfoServiceImpl implements CertificateInfoService { @Override public List getAllByIDList(Map map) { - List list = certificateInfoMapper.getAllByIdList((List) map.get("idList")); + List list = certificateInfoMapper.getAllByIdList((List) map.get("ids")); return list; } } diff --git a/src/main/java/com/soft/line/service/impl/ContractInfoServiceImpl.java b/src/main/java/com/soft/line/service/impl/ContractInfoServiceImpl.java index 4cf0816..a73e323 100644 --- a/src/main/java/com/soft/line/service/impl/ContractInfoServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/ContractInfoServiceImpl.java @@ -64,4 +64,9 @@ public class ContractInfoServiceImpl implements ContractInfoService{ public int countContractByIdAndDeptAndTypeAndName(Integer id, String deptId, String proId, String contractName) { return contractInfoMapper.countContractByIdAndDeptAndTypeAndName(id, deptId, proId, contractName); } + + @Override + public List getAllByIDList(Map map) { + return contractInfoMapper.getAllByIdList((List)map.get("ids")); + } } diff --git a/src/main/java/com/soft/line/util/poi/PoiUtils.java b/src/main/java/com/soft/line/util/poi/PoiUtils.java index 72c715e..421b1f4 100644 --- a/src/main/java/com/soft/line/util/poi/PoiUtils.java +++ b/src/main/java/com/soft/line/util/poi/PoiUtils.java @@ -2,6 +2,7 @@ package com.soft.line.util.poi; import com.soft.line.entity.CertificateInfo; import com.soft.line.entity.ContractInfo; +import com.sun.deploy.net.HttpUtils; import org.apache.poi.hssf.usermodel.*; import org.apache.poi.ss.usermodel.*; import org.apache.poi.xssf.usermodel.XSSFWorkbook; @@ -9,15 +10,21 @@ import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; import org.springframework.web.multipart.MultipartFile; +import javax.servlet.http.HttpServletResponse; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; +import java.io.OutputStream; +import java.net.URLEncoder; +import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Date; import java.util.List; public class PoiUtils { - public void certificate2Excel(List list){ + public void certificate2Excel(List list, HttpServletResponse response){ + String title = "证书信息表"; //创建一个 Excel 文档 HSSFWorkbook workbook = new HSSFWorkbook(); //5. 创建样式 @@ -25,9 +32,7 @@ public class PoiUtils { HSSFCellStyle headerStyle = workbook.createCellStyle(); headerStyle.setFillForegroundColor(IndexedColors.YELLOW.index); headerStyle.setFillPattern(FillPatternType.SOLID_FOREGROUND); - HSSFCellStyle dateCellStyle = workbook.createCellStyle(); - dateCellStyle.setDataFormat(HSSFDataFormat.getBuiltinFormat("yyyy/mm/dd")); - HSSFSheet sheet = workbook.createSheet("证书信息表"); + HSSFSheet sheet = workbook.createSheet(title); //创建标题行 HSSFRow r0 = sheet.createRow(0); HSSFCell c0 = r0.createCell(0); @@ -58,27 +63,124 @@ public class PoiUtils { row.createCell(1).setCellValue(cert.getCertType()); row.createCell(2).setCellValue(cert.getCertName()); row.createCell(3).setCellValue(cert.getCertUnit()); - HSSFCell cell4 = row.createCell(4); - cell4.setCellStyle(dateCellStyle); - cell4.setCellValue(cert.getBeginDate()); - HSSFCell cell5 =row.createCell(5); - cell5.setCellStyle(dateCellStyle); - cell5.setCellValue(cert.getEndDate()); + row.createCell(4).setCellValue(dateToString(cert.getBeginDate())); + row.createCell(5).setCellValue(dateToString(cert.getEndDate())); row.createCell(6).setCellValue(cert.getNote()); } ByteArrayOutputStream baos = new ByteArrayOutputStream(); - HttpHeaders headers = new HttpHeaders(); try { - headers.setContentDispositionFormData("attachment", new String("证书信息表.xls".getBytes("UTF-8"), "ISO-8859-1")); - headers.setContentType(MediaType.APPLICATION_OCTET_STREAM); workbook.write(baos); + response.setContentType("application/octet-stream;charset=utf-8"); + OutputStream outputStream = response.getOutputStream(); + outputStream.write(baos.toByteArray()); + outputStream.close(); } catch (IOException e) { e.printStackTrace(); + }finally { + try { + if (baos != null) { + baos.close(); + } + } catch (IOException e) { + e.printStackTrace(); + } + + try { + workbook.close(); + } catch (IOException e) { + e.printStackTrace(); + } } } - public void contract2Excel(List list){ + public void contract2Excel(List list, HttpServletResponse response){ + String title = "合同信息表"; + //创建一个 Excel 文档 + HSSFWorkbook workbook = new HSSFWorkbook(); + //5. 创建样式 + //创建标题行的样式 + HSSFCellStyle headerStyle = workbook.createCellStyle(); + headerStyle.setFillForegroundColor(IndexedColors.YELLOW.index); + headerStyle.setFillPattern(FillPatternType.SOLID_FOREGROUND); + HSSFSheet sheet = workbook.createSheet(title); + //创建标题行 + HSSFRow r0 = sheet.createRow(0); + HSSFCell c0 = r0.createCell(0); + c0.setCellValue("部门"); + c0.setCellStyle(headerStyle); + HSSFCell c1 = r0.createCell(1); + c1.setCellStyle(headerStyle); + c1.setCellValue("合同名称"); + HSSFCell c2 = r0.createCell(2); + c2.setCellStyle(headerStyle); + c2.setCellValue("项目"); + HSSFCell c3 = r0.createCell(3); + c3.setCellStyle(headerStyle); + c3.setCellValue("总金额"); + HSSFCell c4 = r0.createCell(4); + c4.setCellStyle(headerStyle); + c4.setCellValue("第一签约方"); + HSSFCell c5 = r0.createCell(5); + c5.setCellStyle(headerStyle); + c5.setCellValue("第二签约方"); + HSSFCell c6 = r0.createCell(6); + c6.setCellStyle(headerStyle); + c6.setCellValue("签约时间"); + HSSFCell c7 = r0.createCell(7); + c7.setCellStyle(headerStyle); + c7.setCellValue("签约地点"); + HSSFCell c8 = r0.createCell(8); + c8.setCellStyle(headerStyle); + c8.setCellValue("起始日期"); + HSSFCell c9 = r0.createCell(9); + c9.setCellStyle(headerStyle); + c9.setCellValue("终止日期"); + HSSFCell c10 = r0.createCell(10); + c10.setCellStyle(headerStyle); + c10.setCellValue("付款方式"); + HSSFCell c11 = r0.createCell(11); + c11.setCellStyle(headerStyle); + c11.setCellValue("备注"); + for(int i = 0; i < list.size(); i++){ + ContractInfo cont =list.get(i); + HSSFRow row = sheet.createRow(i + 1); + row.createCell(0).setCellValue(cont.getDepId()); + row.createCell(1).setCellValue(cont.getContractName()); + row.createCell(2).setCellValue(cont.getProId()); + row.createCell(3).setCellValue(cont.getTotalAmount().toString()); + row.createCell(4).setCellValue(cont.getPartA()); + row.createCell(5).setCellValue(cont.getPartB()); + row.createCell(6).setCellValue(dateToString(cont.getSignTime())); + row.createCell(7).setCellValue(cont.getSignAddr()); + row.createCell(8).setCellValue(dateToString(cont.getBeginDate())); + row.createCell(9).setCellValue(dateToString(cont.getEndDate())); + row.createCell(10).setCellValue(cont.getPayment()); + row.createCell(11).setCellValue(cont.getNote()); + } + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + try { + workbook.write(baos); + response.setContentType("application/octet-stream;charset=utf-8"); + OutputStream outputStream = response.getOutputStream(); + outputStream.write(baos.toByteArray()); + outputStream.close(); + } catch (IOException e) { + e.printStackTrace(); + }finally { + try { + if (baos != null) { + baos.close(); + } + } catch (IOException e) { + e.printStackTrace(); + } + try { + workbook.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } } public List excel2Certificate(MultipartFile file){ @@ -108,7 +210,7 @@ public class PoiUtils { System.out.println(row.getCell(0).getStringCellValue()); } }catch (IOException e){ - + e.printStackTrace(); } return certificateInfoList; @@ -145,4 +247,9 @@ public class PoiUtils { } return contractInfoList; } + + public String dateToString(Date date){ + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + return sdf.format(date); + } } -- Gitee From 155870fef0fb38ecaa5ab49839f67c3beb81885d Mon Sep 17 00:00:00 2001 From: ljc Date: Wed, 3 Jun 2020 17:17:36 +0800 Subject: [PATCH 083/211] =?UTF-8?q?=E8=AF=81=E4=B9=A6=E5=90=88=E5=90=8C?= =?UTF-8?q?=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CertificateInfoController.java | 2 + .../util/config/ResourceConfigAdapter.java | 6 + .../java/com/soft/line/util/poi/PoiUtils.java | 174 ++++++++++++++---- 3 files changed, 147 insertions(+), 35 deletions(-) diff --git a/src/main/java/com/soft/line/controller/CertificateInfoController.java b/src/main/java/com/soft/line/controller/CertificateInfoController.java index 083cc74..8c3f955 100644 --- a/src/main/java/com/soft/line/controller/CertificateInfoController.java +++ b/src/main/java/com/soft/line/controller/CertificateInfoController.java @@ -103,6 +103,7 @@ public class CertificateInfoController { @ApiOperation(value = "导入证书", notes = "导入证书") @PostMapping("/certificate/import") public CommonResult importCertificate(@RequestParam MultipartFile file, HttpServletRequest request) { + System.out.println("importCertificate"); if (file == null){ return CommonResult.success("上传文件不能为空"); } @@ -112,6 +113,7 @@ public class CertificateInfoController { } PoiUtils poiUtils = new PoiUtils(); List certificateInfoList = poiUtils.excel2Certificate(file); + return CommonResult.success("导入成功"); } diff --git a/src/main/java/com/soft/line/util/config/ResourceConfigAdapter.java b/src/main/java/com/soft/line/util/config/ResourceConfigAdapter.java index 84eeb7b..85c2f2f 100644 --- a/src/main/java/com/soft/line/util/config/ResourceConfigAdapter.java +++ b/src/main/java/com/soft/line/util/config/ResourceConfigAdapter.java @@ -25,6 +25,12 @@ public class ResourceConfigAdapter extends WebMvcConfigurationSupport { registry.addResourceHandler(uploadFileMapping). addResourceLocations("file:/user/softline-files-manage-uploadFiles/"); } + registry.addResourceHandler("/**").addResourceLocations( + "classpath:/static/"); + registry.addResourceHandler("swagger-ui.html").addResourceLocations( + "classpath:/META-INF/resources/"); + registry.addResourceHandler("/webjars/**").addResourceLocations( + "classpath:/META-INF/resources/webjars/"); super.addResourceHandlers(registry); } } diff --git a/src/main/java/com/soft/line/util/poi/PoiUtils.java b/src/main/java/com/soft/line/util/poi/PoiUtils.java index 421b1f4..9e36e47 100644 --- a/src/main/java/com/soft/line/util/poi/PoiUtils.java +++ b/src/main/java/com/soft/line/util/poi/PoiUtils.java @@ -2,12 +2,9 @@ package com.soft.line.util.poi; import com.soft.line.entity.CertificateInfo; import com.soft.line.entity.ContractInfo; -import com.sun.deploy.net.HttpUtils; import org.apache.poi.hssf.usermodel.*; import org.apache.poi.ss.usermodel.*; import org.apache.poi.xssf.usermodel.XSSFWorkbook; -import org.springframework.http.HttpHeaders; -import org.springframework.http.MediaType; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; @@ -15,7 +12,6 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.net.URLEncoder; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; @@ -23,7 +19,7 @@ import java.util.List; public class PoiUtils { - public void certificate2Excel(List list, HttpServletResponse response){ + public void certificate2Excel(List list, HttpServletResponse response) { String title = "证书信息表"; //创建一个 Excel 文档 HSSFWorkbook workbook = new HSSFWorkbook(); @@ -36,14 +32,14 @@ public class PoiUtils { //创建标题行 HSSFRow r0 = sheet.createRow(0); HSSFCell c0 = r0.createCell(0); - c0.setCellValue("证书编号"); + c0.setCellValue("证书类型"); c0.setCellStyle(headerStyle); HSSFCell c1 = r0.createCell(1); c1.setCellStyle(headerStyle); - c1.setCellValue("证书类型"); + c1.setCellValue("证书名称"); HSSFCell c2 = r0.createCell(2); c2.setCellStyle(headerStyle); - c2.setCellValue("证书名称"); + c2.setCellValue("证书编号"); HSSFCell c3 = r0.createCell(3); c3.setCellStyle(headerStyle); c3.setCellValue("颁奖单位"); @@ -56,8 +52,8 @@ public class PoiUtils { HSSFCell c6 = r0.createCell(6); c6.setCellStyle(headerStyle); c6.setCellValue("备注"); - for(int i = 0; i < list.size(); i++){ - CertificateInfo cert =list.get(i); + for (int i = 0; i < list.size(); i++) { + CertificateInfo cert = list.get(i); HSSFRow row = sheet.createRow(i + 1); row.createCell(0).setCellValue(cert.getCertId()); row.createCell(1).setCellValue(cert.getCertType()); @@ -76,7 +72,7 @@ public class PoiUtils { outputStream.close(); } catch (IOException e) { e.printStackTrace(); - }finally { + } finally { try { if (baos != null) { baos.close(); @@ -93,7 +89,7 @@ public class PoiUtils { } } - public void contract2Excel(List list, HttpServletResponse response){ + public void contract2Excel(List list, HttpServletResponse response) { String title = "合同信息表"; //创建一个 Excel 文档 HSSFWorkbook workbook = new HSSFWorkbook(); @@ -141,8 +137,8 @@ public class PoiUtils { HSSFCell c11 = r0.createCell(11); c11.setCellStyle(headerStyle); c11.setCellValue("备注"); - for(int i = 0; i < list.size(); i++){ - ContractInfo cont =list.get(i); + for (int i = 0; i < list.size(); i++) { + ContractInfo cont = list.get(i); HSSFRow row = sheet.createRow(i + 1); row.createCell(0).setCellValue(cont.getDepId()); row.createCell(1).setCellValue(cont.getContractName()); @@ -166,7 +162,7 @@ public class PoiUtils { outputStream.close(); } catch (IOException e) { e.printStackTrace(); - }finally { + } finally { try { if (baos != null) { baos.close(); @@ -183,11 +179,12 @@ public class PoiUtils { } } - public List excel2Certificate(MultipartFile file){ - List certificateInfoList = new ArrayList(); - try{ - String fileName = file.getOriginalFilename(); - boolean isExcel2003 = true; + public List excel2Certificate(MultipartFile file) { + List list = new ArrayList(); + CertificateInfo cert = null; + try { + String fileName = file.getOriginalFilename(); + boolean isExcel2003 = true; if (fileName.matches("^.+\\.(?i)(xlsx)$")) { isExcel2003 = false; } @@ -198,27 +195,134 @@ public class PoiUtils { } else { wb = new XSSFWorkbook(is); } - Sheet sheet = wb.getSheetAt(0); - if (sheet != null) { - //notNull = true; - } - for (int r = 1; r <= sheet.getLastRowNum(); r++) { - Row row = sheet.getRow(r); - if (row == null) { - continue; + //2. 获取 workbook 中表单的数量 + int numberOfSheets = wb.getNumberOfSheets(); + for (int i = 0; i < numberOfSheets; i++) { + //3. 获取表单 + Sheet sheet = wb.getSheetAt(i); + //4. 获取表单中的行数 + int physicalNumberOfRows = sheet.getPhysicalNumberOfRows(); + for (int j = 0; j < physicalNumberOfRows; j++) { + //5. 跳过标题行 + if (j == 0) { + continue;//跳过标题行 + } + //6. 获取行 + Row row = sheet.getRow(j); + if (row == null) { + continue;//防止数据中间有空行 + } + //7. 获取列数 + int physicalNumberOfCells = row.getPhysicalNumberOfCells(); + cert = new CertificateInfo(); + for (int k = 0; k < physicalNumberOfCells; k++) { + Cell cell = row.getCell(k); + switch (cell.getCellType()) { + case STRING: + String cellValue = cell.getStringCellValue(); + switch (k) { + case 1: + employee.setName(cellValue); + break; + case 2: + employee.setWorkID(cellValue); + break; + case 3: + employee.setGender(cellValue); + break; + case 5: + employee.setIdCard(cellValue); + break; + case 6: + employee.setWedlock(cellValue); + break; + case 7: + int nationIndex = allNations.indexOf(new Nation(cellValue)); + employee.setNationId(allNations.get(nationIndex).getId()); + break; + case 8: + employee.setNativePlace(cellValue); + break; + case 9: + int politicstatusIndex = allPoliticsstatus.indexOf(new Politicsstatus(cellValue)); + employee.setPoliticId(allPoliticsstatus.get(politicstatusIndex).getId()); + break; + case 10: + employee.setPhone(cellValue); + break; + case 11: + employee.setAddress(cellValue); + break; + case 12: + int departmentIndex = allDepartments.indexOf(new Department(cellValue)); + employee.setDepartmentId(allDepartments.get(departmentIndex).getId()); + break; + case 13: + int jobLevelIndex = allJobLevels.indexOf(new JobLevel(cellValue)); + employee.setJobLevelId(allJobLevels.get(jobLevelIndex).getId()); + break; + case 14: + int positionIndex = allPositions.indexOf(new Position(cellValue)); + employee.setPosId(allPositions.get(positionIndex).getId()); + break; + case 15: + employee.setEngageForm(cellValue); + break; + case 16: + employee.setTiptopDegree(cellValue); + break; + case 17: + employee.setSpecialty(cellValue); + break; + case 18: + employee.setSchool(cellValue); + break; + case 20: + employee.setWorkState(cellValue); + break; + case 21: + employee.setEmail(cellValue); + break; + } + break; + default: { + switch (k) { + case 4: + employee.setBirthday(cell.getDateCellValue()); + break; + case 19: + employee.setBeginDate(cell.getDateCellValue()); + break; + case 23: + employee.setBeginContract(cell.getDateCellValue()); + break; + case 24: + employee.setEndContract(cell.getDateCellValue()); + break; + case 22: + employee.setContractTerm(cell.getNumericCellValue()); + break; + case 25: + employee.setConversionTime(cell.getDateCellValue()); + break; + } + } + break; + } + } + list.add(employee); } - System.out.println(row.getCell(0).getStringCellValue()); } - }catch (IOException e){ + } catch (IOException e) { e.printStackTrace(); } - return certificateInfoList; + return list; } - public List excel2ContractInfo(MultipartFile file){ + public List excel2ContractInfo(MultipartFile file) { List contractInfoList = new ArrayList(); - try{ + try { String fileName = file.getOriginalFilename(); boolean isExcel2003 = true; if (fileName.matches("^.+\\.(?i)(xlsx)$")) { @@ -242,13 +346,13 @@ public class PoiUtils { } System.out.println(row.getCell(0).getStringCellValue()); } - }catch (IOException e){ + } catch (IOException e) { } return contractInfoList; } - public String dateToString(Date date){ + public String dateToString(Date date) { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); return sdf.format(date); } -- Gitee From 5479b4441ab99508f584243c703eda5b24a5e12e Mon Sep 17 00:00:00 2001 From: wuxueqiao <17625808004@163.com> Date: Wed, 3 Jun 2020 17:36:39 +0800 Subject: [PATCH 084/211] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E7=9A=84=E6=9D=83=E9=99=90=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- softline-files-manage.iml | 5 ++ .../soft/line/controller/LoginController.java | 11 +++- .../com/soft/line/entity/UserPermission.java | 33 ++++++++++ .../com/soft/line/service/LoginService.java | 8 ++- .../line/service/impl/LoginServiceImpl.java | 63 +++++++++++++++---- 5 files changed, 103 insertions(+), 17 deletions(-) create mode 100644 src/main/java/com/soft/line/entity/UserPermission.java diff --git a/softline-files-manage.iml b/softline-files-manage.iml index 3162b08..ac3a1a6 100644 --- a/softline-files-manage.iml +++ b/softline-files-manage.iml @@ -25,6 +25,11 @@ + + + + + diff --git a/src/main/java/com/soft/line/controller/LoginController.java b/src/main/java/com/soft/line/controller/LoginController.java index a61bf3f..bd0213f 100644 --- a/src/main/java/com/soft/line/controller/LoginController.java +++ b/src/main/java/com/soft/line/controller/LoginController.java @@ -35,14 +35,19 @@ public class LoginController { @ApiImplicitParam(paramType = "query", name = "password", value = "密码", required = false, dataType = "String") }) @PostMapping("/login") - public ResultData loginUserInfo(@RequestBody Map map){ + public CommonResult loginUserInfo(@RequestBody Map map){ return loginService.userLogin(map); } @ApiOperation(value = "登出", notes = "登出系统") @ApiImplicitParams({ }) - @PostMapping("/loginout") - public ResultData exitUser(){ + @PostMapping("/logout") + public CommonResult exitUser(){ return loginService.loginOut(); } + + @PostMapping("/userInfo") + public CommonResult getUserInfo(){ + return CommonResult.success(loginService.getUserPermission()); + } } diff --git a/src/main/java/com/soft/line/entity/UserPermission.java b/src/main/java/com/soft/line/entity/UserPermission.java new file mode 100644 index 0000000..3eb0986 --- /dev/null +++ b/src/main/java/com/soft/line/entity/UserPermission.java @@ -0,0 +1,33 @@ +package com.soft.line.entity; + +import lombok.Data; + +import java.util.Date; +import java.util.List; +import java.util.Map; + +/** + * @author wu.xueqiao on 2020/6/3. + * @version 0.1 + */ +@Data +public class UserPermission { + + private int id; + + private String userName; + + private int status; + + private String phone; + + private Date modifyTime; + + private String avatar; + + private int roleId; + + private RoleInfo role; + + private List> menuList; +} diff --git a/src/main/java/com/soft/line/service/LoginService.java b/src/main/java/com/soft/line/service/LoginService.java index 1ae13e1..fd419b5 100644 --- a/src/main/java/com/soft/line/service/LoginService.java +++ b/src/main/java/com/soft/line/service/LoginService.java @@ -1,7 +1,9 @@ package com.soft.line.service; import com.soft.line.entity.UserInfo; +import com.soft.line.entity.UserPermission; import com.soft.line.util.MP.AjaxResult; +import com.soft.line.util.exception.CommonResult; import com.soft.line.util.exception.ResultData; import java.util.Map; @@ -12,13 +14,15 @@ import java.util.Map; */ public interface LoginService { - public ResultData userLogin(Map map); + public CommonResult userLogin(Map map); - public ResultData loginOut(); + public CommonResult loginOut(); public AjaxResult autoLogin(String code); AjaxResult bindUserInfo(Map map); AjaxResult getUserInfo(Map map); + + UserPermission getUserPermission(); } diff --git a/src/main/java/com/soft/line/service/impl/LoginServiceImpl.java b/src/main/java/com/soft/line/service/impl/LoginServiceImpl.java index e1caf35..85caecc 100644 --- a/src/main/java/com/soft/line/service/impl/LoginServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/LoginServiceImpl.java @@ -1,10 +1,12 @@ package com.soft.line.service.impl; -import com.soft.line.entity.UserInfo; -import com.soft.line.entity.UserInfoToken; +import com.soft.line.entity.*; import com.soft.line.filter.GsonUtil; import com.soft.line.filter.HttpRequestUtil; import com.soft.line.filter.UserTokenDto; +import com.soft.line.mapper.ButtonInfoMapper; +import com.soft.line.mapper.MenuInfoMapper; +import com.soft.line.mapper.RoleInfoMapper; import com.soft.line.mapper.UserInfoMapper; import com.soft.line.service.LoginService; import com.soft.line.util.MP.AjaxResult; @@ -21,9 +23,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; -import java.util.HashMap; -import java.util.Map; -import java.util.UUID; +import java.util.*; import static com.soft.line.filter.HttpRequestUtil.REDIS_SERVICE; @@ -39,8 +39,14 @@ public class LoginServiceImpl implements LoginService { private UserInfoMapper userInfoMapper; @Resource private RedisClient redisClient; + @Autowired + private RoleInfoMapper roleInfoMapper; + @Autowired + private MenuInfoMapper menuInfoMapper; + @Autowired + private ButtonInfoMapper buttonInfoMapper; @Override - public ResultData userLogin(Map map) { + public CommonResult userLogin(Map map) { UserInfo userInfo= userInfoMapper.userLogin(map); if(userInfo!=null){ @@ -55,23 +61,23 @@ public class LoginServiceImpl implements LoginService { String token=returnToken(user); user.setToken(token); if (token == null || "".equals(token)) { - return new ResultData(0, "redis插入失败", null); + return CommonResult.failed("redis插入失败"); } - return new ResultData(200, "登录成功", user); + return CommonResult.success(user); }else{ - return new ResultData(500,"登录失败！",null); + return CommonResult.failed("登录失败！"); } } @Override - public ResultData loginOut() { + public CommonResult loginOut() { UserTokenDto userTokenDto=HttpRequestUtil.getUserToken(); String key=userTokenDto.getUserInfo().getUserName(); boolean out=REDIS_SERVICE.del(key); if(out){ - return new ResultData(200,"退出登录成功！",null); + return CommonResult.success("退出登录成功！"); }else { - return new ResultData(500,"退出登录失败！",null); + return CommonResult.failed("退出登录失败！"); } } @@ -204,4 +210,37 @@ public class LoginServiceImpl implements LoginService { } return AjaxResult.error(); } + + @Override + public UserPermission getUserPermission() { + UserTokenDto userTokenDto=HttpRequestUtil.getUserToken(); + Integer userId = userTokenDto.getUserInfo().getId(); + UserInfo userInfo=userInfoMapper.selectByPrimaryKey(userId); + UserPermission userPermission=new UserPermission(); + userPermission.setId(userId); + userPermission.setPhone(userInfo.getPhone()); + userPermission.setAvatar(userInfo.getHeadImgUrl()); + userPermission.setModifyTime(userInfo.getModifyTime()); + userPermission.setRoleId(userInfo.getRoleId()); + userPermission.setUserName(userInfo.getUserName()); + userPermission.setStatus(Integer.parseInt(userInfo.getUserStatus())); + //获取对应角色 + RoleInfo role = roleInfoMapper.selectByPrimaryKey(userInfo.getRoleId()); + userPermission.setRole(role); + List> menuList = new ArrayList<>(); + for (RoleInfo roleInfo:roleInfoMapper.selectAll(role.getName())){ + for (MenuInfo menuInfo:menuInfoMapper.selectByRoleId(roleInfo.getId())){ + Map menuMap = new HashMap<>(); + menuMap.put("menuId",menuInfo.getId()); + menuMap.put("menuName",menuInfo.getMenuName()); + menuMap.put("menuUrl",menuInfo.getMenuUrl()); + List buttonList=buttonInfoMapper.selectButtonsByRoleIdAndMenuId(roleInfo.getId(),menuInfo.getId()); + menuMap.put("buttonList",buttonList); + menuList.add(menuMap); + } + + } + userPermission.setMenuList(menuList); + return userPermission; + } } -- Gitee From 3a85ff92ab268a172b9d80c4b9d4e03ad5e9fa98 Mon Sep 17 00:00:00 2001 From: wuxueqiao <17625808004@163.com> Date: Thu, 4 Jun 2020 14:00:56 +0800 Subject: [PATCH 085/211] =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=A7=92=E8=89=B2?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- softline-files-manage.iml | 7 +------ .../java/com/soft/line/mapper/MenuInfoMapper.java | 3 +++ .../java/com/soft/line/mapper/MenuInfoMapper.xml | 5 +++++ .../com/soft/line/service/impl/LoginServiceImpl.java | 12 +++++++++++- src/main/resources/application.properties | 6 +++--- 6 files changed, 24 insertions(+), 11 deletions(-) diff --git a/pom.xml b/pom.xml index 5907926..8125f1e 100644 --- a/pom.xml +++ b/pom.xml @@ -39,7 +39,7 @@ mysql mysql-connector-java - 5.1.40 + 5.1.6 runtime diff --git a/softline-files-manage.iml b/softline-files-manage.iml index ac3a1a6..6a4c8fa 100644 --- a/softline-files-manage.iml +++ b/softline-files-manage.iml @@ -25,11 +25,6 @@ - - - - - @@ -65,7 +60,7 @@ - + diff --git a/src/main/java/com/soft/line/mapper/MenuInfoMapper.java b/src/main/java/com/soft/line/mapper/MenuInfoMapper.java index 9ef13a0..006eec4 100644 --- a/src/main/java/com/soft/line/mapper/MenuInfoMapper.java +++ b/src/main/java/com/soft/line/mapper/MenuInfoMapper.java @@ -7,6 +7,7 @@ import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import java.util.List; +import java.util.Map; public interface MenuInfoMapper { /** @@ -44,5 +45,7 @@ public interface MenuInfoMapper { //查询role_menu中的menu_info List selectByRoleId(@Param("roleId") Integer roleId); + Map getParentMenu(int id); + } \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/MenuInfoMapper.xml b/src/main/java/com/soft/line/mapper/MenuInfoMapper.xml index cb616af..fbb5ef1 100644 --- a/src/main/java/com/soft/line/mapper/MenuInfoMapper.xml +++ b/src/main/java/com/soft/line/mapper/MenuInfoMapper.xml @@ -111,4 +111,9 @@ AND rm.menu_button_id = mbi.id AND rm.role_id = #{roleId} + + \ No newline at end of file diff --git a/src/main/java/com/soft/line/service/impl/LoginServiceImpl.java b/src/main/java/com/soft/line/service/impl/LoginServiceImpl.java index 85caecc..c48d041 100644 --- a/src/main/java/com/soft/line/service/impl/LoginServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/LoginServiceImpl.java @@ -17,6 +17,7 @@ import com.soft.line.util.exception.ResultData; import com.soft.line.util.redis.RedisClient; import io.jsonwebtoken.Jwts; import io.jsonwebtoken.SignatureAlgorithm; +import io.swagger.models.auth.In; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -24,6 +25,7 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.*; +import java.util.stream.Collectors; import static com.soft.line.filter.HttpRequestUtil.REDIS_SERVICE; @@ -228,17 +230,25 @@ public class LoginServiceImpl implements LoginService { RoleInfo role = roleInfoMapper.selectByPrimaryKey(userInfo.getRoleId()); userPermission.setRole(role); List> menuList = new ArrayList<>(); + List list=new ArrayList<>(); for (RoleInfo roleInfo:roleInfoMapper.selectAll(role.getName())){ for (MenuInfo menuInfo:menuInfoMapper.selectByRoleId(roleInfo.getId())){ Map menuMap = new HashMap<>(); menuMap.put("menuId",menuInfo.getId()); menuMap.put("menuName",menuInfo.getMenuName()); menuMap.put("menuUrl",menuInfo.getMenuUrl()); + menuMap.put("menuIcon",menuInfo.getMenuIcon()); + if(menuInfo.getpId()!=-1){ + list.add(menuInfo.getpId()); + } List buttonList=buttonInfoMapper.selectButtonsByRoleIdAndMenuId(roleInfo.getId(),menuInfo.getId()); menuMap.put("buttonList",buttonList); menuList.add(menuMap); } - + } + List pList=list.stream().distinct().collect(Collectors.toList()); + for(Integer id:pList){ + menuList.add(menuInfoMapper.getParentMenu(id)); } userPermission.setMenuList(menuList); return userPermission; diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index bfb1e26..fa5dce4 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,6 +1,6 @@ server.port=9100 server.servlet.context-path=/softline -spring.datasource.url= jdbc:mysql://localhost:3306/rz_archives?characterEncoding=utf-8 +spring.datasource.url= jdbc:mysql://175.24.112.245:3306/rz_archives?characterEncoding=utf-8&useSSL=false spring.datasource.username=root spring.datasource.password=root spring.datasource.driver-class-name=com.mysql.jdbc.Driver @@ -14,8 +14,8 @@ spring.datasource.druid.timeBetweenEvictionRunsMillis=60000 spring.datasource.druid.minEvictableIdleTimeMillis=300000 spring.datasource.druid.validationQuery=SELECT?1?FROM?DUAL spring.datasource.druid.testWhileIdle=true -spring.datasource.druid.testOnBorrow=false -spring.datasource.druid.testOnReturn=false +spring.datasource.druid.testOnBorrow=true +spring.datasource.druid.testOnReturn=true spring.datasource.druid.poolPreparedStatements=true spring.datasource.druid.filters=stat,wall spring.datasource.druid.maxPoolPreparedStatementPerConnectionSize=20 -- Gitee From e7b9a79d926782578b8018ee7e577cf426227068 Mon Sep 17 00:00:00 2001 From: ljc Date: Thu, 4 Jun 2020 15:06:33 +0800 Subject: [PATCH 086/211] =?UTF-8?q?=E8=AF=81=E4=B9=A6=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/soft/line/util/poi/PoiUtils.java | 87 ++----------------- 1 file changed, 9 insertions(+), 78 deletions(-) diff --git a/src/main/java/com/soft/line/util/poi/PoiUtils.java b/src/main/java/com/soft/line/util/poi/PoiUtils.java index 9e36e47..b600da8 100644 --- a/src/main/java/com/soft/line/util/poi/PoiUtils.java +++ b/src/main/java/com/soft/line/util/poi/PoiUtils.java @@ -222,98 +222,29 @@ public class PoiUtils { String cellValue = cell.getStringCellValue(); switch (k) { case 1: - employee.setName(cellValue); + mysql: + cert.setCertName(cellValue); break; case 2: - employee.setWorkID(cellValue); - break; - case 3: - employee.setGender(cellValue); - break; - case 5: - employee.setIdCard(cellValue); - break; - case 6: - employee.setWedlock(cellValue); - break; - case 7: - int nationIndex = allNations.indexOf(new Nation(cellValue)); - employee.setNationId(allNations.get(nationIndex).getId()); - break; - case 8: - employee.setNativePlace(cellValue); - break; - case 9: - int politicstatusIndex = allPoliticsstatus.indexOf(new Politicsstatus(cellValue)); - employee.setPoliticId(allPoliticsstatus.get(politicstatusIndex).getId()); - break; - case 10: - employee.setPhone(cellValue); - break; - case 11: - employee.setAddress(cellValue); - break; - case 12: - int departmentIndex = allDepartments.indexOf(new Department(cellValue)); - employee.setDepartmentId(allDepartments.get(departmentIndex).getId()); - break; - case 13: - int jobLevelIndex = allJobLevels.indexOf(new JobLevel(cellValue)); - employee.setJobLevelId(allJobLevels.get(jobLevelIndex).getId()); - break; - case 14: - int positionIndex = allPositions.indexOf(new Position(cellValue)); - employee.setPosId(allPositions.get(positionIndex).getId()); - break; - case 15: - employee.setEngageForm(cellValue); - break; - case 16: - employee.setTiptopDegree(cellValue); - break; - case 17: - employee.setSpecialty(cellValue); - break; - case 18: - employee.setSchool(cellValue); - break; - case 20: - employee.setWorkState(cellValue); - break; - case 21: - employee.setEmail(cellValue); + cert.setCertId(cellValue); break; + } break; default: { switch (k) { case 4: - employee.setBirthday(cell.getDateCellValue()); - break; - case 19: - employee.setBeginDate(cell.getDateCellValue()); - break; - case 23: - employee.setBeginContract(cell.getDateCellValue()); - break; - case 24: - employee.setEndContract(cell.getDateCellValue()); - break; - case 22: - employee.setContractTerm(cell.getNumericCellValue()); - break; - case 25: - employee.setConversionTime(cell.getDateCellValue()); + //cert.getBeginDate(cell.getDateCellValue()); break; + } + break; } - break; } + list.add(cert); } - list.add(employee); } - } - } catch (IOException e) { + }} catch (IOException e) { e.printStackTrace(); } -- Gitee From e7b09ee8e045f6a42beab50db4aacc6336937b40 Mon Sep 17 00:00:00 2001 From: ljc Date: Thu, 4 Jun 2020 15:14:34 +0800 Subject: [PATCH 087/211] =?UTF-8?q?=E9=99=84=E4=BB=B6=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/soft/line/controller/AttachmentController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/soft/line/controller/AttachmentController.java b/src/main/java/com/soft/line/controller/AttachmentController.java index 984e1cd..2ce9b9c 100644 --- a/src/main/java/com/soft/line/controller/AttachmentController.java +++ b/src/main/java/com/soft/line/controller/AttachmentController.java @@ -18,12 +18,12 @@ import java.util.Map; @RequestMapping("/attachment") public class AttachmentController { - @Value("${uploadFileDir}") + /*@Value("${uploadFileDir}") private String uploadFileDir; @ApiOperation(value = "获取所有证书列表", notes = "获取所有证书列表") @PostMapping("/upload") public CommonResult uploadDir(@RequestBody Map map){ return CommonResult.success(uploadFileDir); - } + }*/ } -- Gitee From d9dec21dd3bb468a9c2a7757e789535b909e32b9 Mon Sep 17 00:00:00 2001 From: ljc Date: Thu, 4 Jun 2020 17:04:15 +0800 Subject: [PATCH 088/211] =?UTF-8?q?=E5=90=88=E5=90=8C=E8=AF=81=E4=B9=A6?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CertificateInfoController.java | 6 +- .../controller/ContractInfoController.java | 5 +- .../com/soft/line/entity/CertificateInfo.java | 249 +----------------- .../line/mapper/CertificateInfoMapper.java | 4 +- .../line/mapper/CertificateInfoMapper.xml | 33 +-- .../soft/line/mapper/ContractInfoMapper.java | 2 +- .../soft/line/mapper/ContractInfoMapper.xml | 4 +- .../line/service/CertificateInfoService.java | 4 +- .../line/service/ContractInfoService.java | 2 +- .../impl/CertificateInfoServiceImpl.java | 9 +- .../service/impl/ContractInfoServiceImpl.java | 4 +- .../java/com/soft/line/util/poi/PoiUtils.java | 58 ++-- 12 files changed, 65 insertions(+), 315 deletions(-) diff --git a/src/main/java/com/soft/line/controller/CertificateInfoController.java b/src/main/java/com/soft/line/controller/CertificateInfoController.java index 8c3f955..66d49bd 100644 --- a/src/main/java/com/soft/line/controller/CertificateInfoController.java +++ b/src/main/java/com/soft/line/controller/CertificateInfoController.java @@ -79,10 +79,8 @@ public class CertificateInfoController { @ApiOperation(value = "保存证书", notes = "保存证书") @PostMapping("/certificate") public CommonResult saveCertificate(@RequestBody Map map) { - if (certificateInfoService.countByCName((Integer) map.get("id"), (String) map.get("certType"), (String) map.get("certName")) > 0) { - return CommonResult.success("相同部门存在相同证书名称"); - } else if (certificateInfoService.countByCId((Integer) map.get("id"), (String) map.get("certType"), (String) map.get("certId")) > 0) { - return CommonResult.success("相同部门存在相同证书编号"); + if (certificateInfoService.countByCId((Integer) map.get("id"), (String) map.get("certId")) > 0) { + return CommonResult.success("存在相同证书编号"); } Date beginDate = StringToDateUtil.convert((String) map.get("beginDate")); Date endDate = StringToDateUtil.convert((String) map.get("endDate")); diff --git a/src/main/java/com/soft/line/controller/ContractInfoController.java b/src/main/java/com/soft/line/controller/ContractInfoController.java index e489725..47aa809 100644 --- a/src/main/java/com/soft/line/controller/ContractInfoController.java +++ b/src/main/java/com/soft/line/controller/ContractInfoController.java @@ -45,7 +45,7 @@ public class ContractInfoController { return CommonResult.success(contractInfoService.getAllContracts(map)); } - @ApiOperation(value = "删除证书", notes = "删除证书") + @ApiOperation(value = "删除合同", notes = "删除合同") @DeleteMapping("/contract") public CommonResult deleteContract(@RequestBody Map map){ contractInfoService.delete(map); @@ -55,8 +55,7 @@ public class ContractInfoController { @ApiOperation(value = "保存合同", notes = "保存合同") @PostMapping("/contract") public CommonResult saveContract(@RequestBody Map map){ - if (contractInfoService.countContractByIdAndDeptAndTypeAndName((Integer)map.get("id"),(String)map.get("depId"), - (String)map.get("proId"),(String)map.get("contractName"))>1){ + if (contractInfoService.countContractByIdAndName((Integer)map.get("id"),(String)map.get("contractName"))>0){ return CommonResult.success("相同部门相同项目类型下存在相同合同名称"); } diff --git a/src/main/java/com/soft/line/entity/CertificateInfo.java b/src/main/java/com/soft/line/entity/CertificateInfo.java index a61467b..9585a5d 100644 --- a/src/main/java/com/soft/line/entity/CertificateInfo.java +++ b/src/main/java/com/soft/line/entity/CertificateInfo.java @@ -8,362 +8,127 @@ import java.util.Date; //@JsonInclude(JsonInclude.Include.NON_NULL) public class CertificateInfo { - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column certificate_info.id - * - * @mbggenerated - */ + private Integer id; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column certificate_info.cert_id - * - * @mbggenerated - */ @NotNull private String certId; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column certificate_info.cert_type - * - * @mbggenerated - */ @NotNull private String certType; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column certificate_info.cert_name - * - * @mbggenerated - */ @NotNull private String certName; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column certificate_info.cert_unit - * - * @mbggenerated - */ + private String projectName; + @NotNull private String certUnit; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column certificate_info.begin_date - * - * @mbggenerated - */ @NotNull @JsonFormat(pattern = "yyyy-MM-dd",timezone = "Asia/Shanghai") private Date beginDate; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column certificate_info.end_date - * - * @mbggenerated - */ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "Asia/Shanghai") private Date endDate; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column certificate_info.note - * - * @mbggenerated - */ private String note; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column certificate_info.modify_person - * - * @mbggenerated - */ private String modifyPerson; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column certificate_info.modify_time - * - * @mbggenerated - */ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "Asia/Shanghai") private Date modifyTime; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column certificate_info.del_flg - * - * @mbggenerated - */ private String delFlg; - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column certificate_info.id - * - * @return the value of certificate_info.id - * - * @mbggenerated - */ public Integer getId() { return id; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column certificate_info.id - * - * @param id the value for certificate_info.id - * - * @mbggenerated - */ public void setId(Integer id) { this.id = id; } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column certificate_info.cert_id - * - * @return the value of certificate_info.cert_id - * - * @mbggenerated - */ public String getCertId() { return certId; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column certificate_info.cert_id - * - * @param certId the value for certificate_info.cert_id - * - * @mbggenerated - */ public void setCertId(String certId) { this.certId = certId == null ? null : certId.trim(); } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column certificate_info.cert_type - * - * @return the value of certificate_info.cert_type - * - * @mbggenerated - */ public String getCertType() { return certType; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column certificate_info.cert_type - * - * @param certType the value for certificate_info.cert_type - * - * @mbggenerated - */ public void setCertType(String certType) { this.certType = certType == null ? null : certType.trim(); } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column certificate_info.cert_name - * - * @return the value of certificate_info.cert_name - * - * @mbggenerated - */ public String getCertName() { return certName; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column certificate_info.cert_name - * - * @param certName the value for certificate_info.cert_name - * - * @mbggenerated - */ public void setCertName(String certName) { this.certName = certName == null ? null : certName.trim(); } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column certificate_info.cert_unit - * - * @return the value of certificate_info.cert_unit - * - * @mbggenerated - */ + public String getProjectName() { return projectName; } + + public void setProjectName(String projectName) { this.projectName = projectName == null ? null : projectName.trim(); } + public String getCertUnit() { return certUnit; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column certificate_info.cert_unit - * - * @param certUnit the value for certificate_info.cert_unit - * - * @mbggenerated - */ public void setCertUnit(String certUnit) { this.certUnit = certUnit == null ? null : certUnit.trim(); } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column certificate_info.begin_date - * - * @return the value of certificate_info.begin_date - * - * @mbggenerated - */ public Date getBeginDate() { return beginDate; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column certificate_info.begin_date - * - * @param beginDate the value for certificate_info.begin_date - * - * @mbggenerated - */ public void setBeginDate(Date beginDate) { this.beginDate = beginDate; } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column certificate_info.end_date - * - * @return the value of certificate_info.end_date - * - * @mbggenerated - */ public Date getEndDate() { return endDate; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column certificate_info.end_date - * - * @param endDate the value for certificate_info.end_date - * - * @mbggenerated - */ public void setEndDate(Date endDate) { this.endDate = endDate; } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column certificate_info.note - * - * @return the value of certificate_info.note - * - * @mbggenerated - */ public String getNote() { return note; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column certificate_info.note - * - * @param note the value for certificate_info.note - * - * @mbggenerated - */ public void setNote(String note) { this.note = note == null ? null : note.trim(); } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column certificate_info.modify_person - * - * @return the value of certificate_info.modify_person - * - * @mbggenerated - */ public String getModifyPerson() { return modifyPerson; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column certificate_info.modify_person - * - * @param modifyPerson the value for certificate_info.modify_person - * - * @mbggenerated - */ public void setModifyPerson(String modifyPerson) { this.modifyPerson = modifyPerson == null ? null : modifyPerson.trim(); } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column certificate_info.modify_time - * - * @return the value of certificate_info.modify_time - * - * @mbggenerated - */ public Date getModifyTime() { return modifyTime; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column certificate_info.modify_time - * - * @param modifyTime the value for certificate_info.modify_time - * - * @mbggenerated - */ public void setModifyTime(Date modifyTime) { this.modifyTime = modifyTime; } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column certificate_info.del_flg - * - * @return the value of certificate_info.del_flg - * - * @mbggenerated - */ public String getDelFlg() { return delFlg; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column certificate_info.del_flg - * - * @param delFlg the value for certificate_info.del_flg - * - * @mbggenerated - */ public void setDelFlg(String delFlg) { this.delFlg = delFlg == null ? null : delFlg.trim(); } diff --git a/src/main/java/com/soft/line/mapper/CertificateInfoMapper.java b/src/main/java/com/soft/line/mapper/CertificateInfoMapper.java index 9887e9c..cea98cf 100644 --- a/src/main/java/com/soft/line/mapper/CertificateInfoMapper.java +++ b/src/main/java/com/soft/line/mapper/CertificateInfoMapper.java @@ -25,9 +25,7 @@ public interface CertificateInfoMapper { List getAllCompanyCertificates(Map map); - int countCertificateByIdAndTypeAndName(@Param("id")Integer id,@Param("certType")String certType,@Param("certName")String certName); - - int countCertificateByIdAndTypeAndCId(@Param("id")Integer id,@Param("certType")String certType,@Param("certId")String certId); + int countCertificateByIdAndCId(@Param("id")Integer id,@Param("certId")String certId); List getAllByIdList(@Param("idList")List idList); } \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/CertificateInfoMapper.xml b/src/main/java/com/soft/line/mapper/CertificateInfoMapper.xml index ab6b2b7..5bc1ade 100644 --- a/src/main/java/com/soft/line/mapper/CertificateInfoMapper.xml +++ b/src/main/java/com/soft/line/mapper/CertificateInfoMapper.xml @@ -10,6 +10,7 @@ + @@ -20,10 +21,10 @@ insert into `certificate_info` (`cert_id`, `cert_type`, `cert_name`, - `cert_unit`, `begin_date`, `end_date`, + `project_name`,`cert_unit`, `begin_date`, `end_date`, `note`, `modify_person`) values (#{certId,jdbcType=VARCHAR}, #{certType,jdbcType=VARCHAR}, #{certName,jdbcType=VARCHAR}, - #{certUnit,jdbcType=VARCHAR}, #{beginDate,jdbcType=TIMESTAMP}, #{endDate,jdbcType=TIMESTAMP}, + #{projectName,jdbcType=VARCHAR},#{certUnit,jdbcType=VARCHAR}, #{beginDate,jdbcType=TIMESTAMP}, #{endDate,jdbcType=TIMESTAMP}, #{note,jdbcType=VARCHAR}, #{modifyPerson,jdbcType=VARCHAR}) @@ -35,6 +36,7 @@ update `certificate_info` set `cert_id` = #{certId,jdbcType=VARCHAR}, `cert_type` = #{certType,jdbcType=VARCHAR}, `cert_name` = #{certName,jdbcType=VARCHAR}, + `project_name` = #{projectName,jdbcType=VARCHAR}, `cert_unit` = #{certUnit,jdbcType=VARCHAR}, `begin_date` = #{beginDate,jdbcType=TIMESTAMP}, `end_Date` = #{endDate,jdbcType=TIMESTAMP}, @@ -45,14 +47,14 @@ - - - select count(*) from `certificate_info` - where `cert_type` = #{certType,jdbcType=VARCHAR} - and `cert_id` = #{certId,jdbcType=VARCHAR} + where `cert_id` = #{certId,jdbcType=VARCHAR} and `id` ]]> #{id,jdbcType=INTEGER} @@ -114,7 +109,7 @@ - select count(*) from `contract_info` WHERE `contract_name` = #{contractName} - and `dep_id` = #{depId} - and `pro_id` = #{proId} AND `id` ]]> #{id,jdbcType=INTEGER} diff --git a/src/main/java/com/soft/line/service/CertificateInfoService.java b/src/main/java/com/soft/line/service/CertificateInfoService.java index 128b9e8..14ea13b 100644 --- a/src/main/java/com/soft/line/service/CertificateInfoService.java +++ b/src/main/java/com/soft/line/service/CertificateInfoService.java @@ -25,9 +25,7 @@ public interface CertificateInfoService { public void update(final Map map); - public int countByCName(Integer id,String cType,String cName); - - public int countByCId(Integer id,String cType,String cId); + public int countByCId(Integer id,String cId); public List getAllByIDList(Map map); } diff --git a/src/main/java/com/soft/line/service/ContractInfoService.java b/src/main/java/com/soft/line/service/ContractInfoService.java index d76ceaa..c99a66b 100644 --- a/src/main/java/com/soft/line/service/ContractInfoService.java +++ b/src/main/java/com/soft/line/service/ContractInfoService.java @@ -24,7 +24,7 @@ public interface ContractInfoService { public void update(Map map); - public int countContractByIdAndDeptAndTypeAndName(Integer id,String deptId,String proId,String contractName); + public int countContractByIdAndName(Integer id,String contractName); public List getAllByIDList(Map map) ; } diff --git a/src/main/java/com/soft/line/service/impl/CertificateInfoServiceImpl.java b/src/main/java/com/soft/line/service/impl/CertificateInfoServiceImpl.java index c9f3403..fcfd3df 100644 --- a/src/main/java/com/soft/line/service/impl/CertificateInfoServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/CertificateInfoServiceImpl.java @@ -53,13 +53,8 @@ public class CertificateInfoServiceImpl implements CertificateInfoService { } @Override - public int countByCName(Integer id, String cType, String cName) { - return certificateInfoMapper.countCertificateByIdAndTypeAndName(id,cType,cName); - } - - @Override - public int countByCId(Integer id, String cType, String cId) { - return certificateInfoMapper.countCertificateByIdAndTypeAndCId(id,cType,cId); + public int countByCId(Integer id, String cId) { + return certificateInfoMapper.countCertificateByIdAndCId(id,cId); } @Override diff --git a/src/main/java/com/soft/line/service/impl/ContractInfoServiceImpl.java b/src/main/java/com/soft/line/service/impl/ContractInfoServiceImpl.java index a73e323..10b032f 100644 --- a/src/main/java/com/soft/line/service/impl/ContractInfoServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/ContractInfoServiceImpl.java @@ -61,8 +61,8 @@ public class ContractInfoServiceImpl implements ContractInfoService{ } @Override - public int countContractByIdAndDeptAndTypeAndName(Integer id, String deptId, String proId, String contractName) { - return contractInfoMapper.countContractByIdAndDeptAndTypeAndName(id, deptId, proId, contractName); + public int countContractByIdAndName(Integer id, String contractName) { + return contractInfoMapper.countContractByIdAndName(id, contractName); } @Override diff --git a/src/main/java/com/soft/line/util/poi/PoiUtils.java b/src/main/java/com/soft/line/util/poi/PoiUtils.java index b600da8..05e6e84 100644 --- a/src/main/java/com/soft/line/util/poi/PoiUtils.java +++ b/src/main/java/com/soft/line/util/poi/PoiUtils.java @@ -39,29 +39,33 @@ public class PoiUtils { c1.setCellValue("证书名称"); HSSFCell c2 = r0.createCell(2); c2.setCellStyle(headerStyle); - c2.setCellValue("证书编号"); + c2.setCellValue("项目名称"); HSSFCell c3 = r0.createCell(3); c3.setCellStyle(headerStyle); c3.setCellValue("颁奖单位"); HSSFCell c4 = r0.createCell(4); c4.setCellStyle(headerStyle); - c4.setCellValue("起始日期"); + c4.setCellValue("证书编号"); HSSFCell c5 = r0.createCell(5); c5.setCellStyle(headerStyle); - c5.setCellValue("终止日期"); + c5.setCellValue("发证日期"); HSSFCell c6 = r0.createCell(6); c6.setCellStyle(headerStyle); - c6.setCellValue("备注"); + c6.setCellValue("到期日期"); + HSSFCell c7 = r0.createCell(7); + c7.setCellStyle(headerStyle); + c7.setCellValue("备注"); for (int i = 0; i < list.size(); i++) { CertificateInfo cert = list.get(i); HSSFRow row = sheet.createRow(i + 1); - row.createCell(0).setCellValue(cert.getCertId()); - row.createCell(1).setCellValue(cert.getCertType()); - row.createCell(2).setCellValue(cert.getCertName()); + row.createCell(0).setCellValue(cert.getCertType()); + row.createCell(1).setCellValue(cert.getCertName()); + row.createCell(2).setCellValue(cert.getProjectName()); row.createCell(3).setCellValue(cert.getCertUnit()); - row.createCell(4).setCellValue(dateToString(cert.getBeginDate())); - row.createCell(5).setCellValue(dateToString(cert.getEndDate())); - row.createCell(6).setCellValue(cert.getNote()); + row.createCell(4).setCellValue(cert.getCertId()); + row.createCell(5).setCellValue(dateToString(cert.getBeginDate())); + row.createCell(6).setCellValue(dateToString(cert.getEndDate())); + row.createCell(7).setCellValue(cert.getNote()); } ByteArrayOutputStream baos = new ByteArrayOutputStream(); try { @@ -106,31 +110,31 @@ public class PoiUtils { c0.setCellStyle(headerStyle); HSSFCell c1 = r0.createCell(1); c1.setCellStyle(headerStyle); - c1.setCellValue("合同名称"); + c1.setCellValue("项目类型"); HSSFCell c2 = r0.createCell(2); c2.setCellStyle(headerStyle); - c2.setCellValue("项目"); + c2.setCellValue("合同名称"); HSSFCell c3 = r0.createCell(3); c3.setCellStyle(headerStyle); - c3.setCellValue("总金额"); + c3.setCellValue("第一签约方"); HSSFCell c4 = r0.createCell(4); c4.setCellStyle(headerStyle); - c4.setCellValue("第一签约方"); + c4.setCellValue("第二签约方"); HSSFCell c5 = r0.createCell(5); c5.setCellStyle(headerStyle); - c5.setCellValue("第二签约方"); + c5.setCellValue("签约地点"); HSSFCell c6 = r0.createCell(6); c6.setCellStyle(headerStyle); - c6.setCellValue("签约时间"); + c6.setCellValue("签约日期"); HSSFCell c7 = r0.createCell(7); c7.setCellStyle(headerStyle); - c7.setCellValue("签约地点"); + c7.setCellValue("起始日期"); HSSFCell c8 = r0.createCell(8); c8.setCellStyle(headerStyle); - c8.setCellValue("起始日期"); + c8.setCellValue("终止日期"); HSSFCell c9 = r0.createCell(9); c9.setCellStyle(headerStyle); - c9.setCellValue("终止日期"); + c9.setCellValue("总金额"); HSSFCell c10 = r0.createCell(10); c10.setCellStyle(headerStyle); c10.setCellValue("付款方式"); @@ -141,15 +145,15 @@ public class PoiUtils { ContractInfo cont = list.get(i); HSSFRow row = sheet.createRow(i + 1); row.createCell(0).setCellValue(cont.getDepId()); - row.createCell(1).setCellValue(cont.getContractName()); - row.createCell(2).setCellValue(cont.getProId()); - row.createCell(3).setCellValue(cont.getTotalAmount().toString()); - row.createCell(4).setCellValue(cont.getPartA()); - row.createCell(5).setCellValue(cont.getPartB()); + row.createCell(1).setCellValue(cont.getProId()); + row.createCell(2).setCellValue(cont.getContractName()); + row.createCell(3).setCellValue(cont.getPartA()); + row.createCell(4).setCellValue(cont.getPartB()); + row.createCell(5).setCellValue(cont.getSignAddr()); row.createCell(6).setCellValue(dateToString(cont.getSignTime())); - row.createCell(7).setCellValue(cont.getSignAddr()); - row.createCell(8).setCellValue(dateToString(cont.getBeginDate())); - row.createCell(9).setCellValue(dateToString(cont.getEndDate())); + row.createCell(7).setCellValue(dateToString(cont.getBeginDate())); + row.createCell(8).setCellValue(dateToString(cont.getEndDate())); + row.createCell(9).setCellValue(cont.getTotalAmount().toString()); row.createCell(10).setCellValue(cont.getPayment()); row.createCell(11).setCellValue(cont.getNote()); } -- Gitee From 69db87876fed3cd478afe3a1bba875c5dc724086 Mon Sep 17 00:00:00 2001 From: ljc <1119265069@qq.com> Date: Fri, 5 Jun 2020 00:21:45 +0800 Subject: [PATCH 089/211] =?UTF-8?q?=E5=90=88=E5=90=8C=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ContractInfoController.java | 3 +- .../java/com/soft/line/util/poi/PoiUtils.java | 134 +++++++++++++++--- 2 files changed, 119 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/soft/line/controller/ContractInfoController.java b/src/main/java/com/soft/line/controller/ContractInfoController.java index 47aa809..f3e8bad 100644 --- a/src/main/java/com/soft/line/controller/ContractInfoController.java +++ b/src/main/java/com/soft/line/controller/ContractInfoController.java @@ -90,7 +90,8 @@ public class ContractInfoController { return CommonResult.success("上传文件格式错误，请上传后缀为.xls或.xlsx的文件"); } PoiUtils poiUtils = new PoiUtils(); - List contractInfoList = poiUtils.excel2ContractInfo(file); + List contractInfoList = null; + poiUtils.excel2ContractInfo(file); return CommonResult.success("导入成功"); } diff --git a/src/main/java/com/soft/line/util/poi/PoiUtils.java b/src/main/java/com/soft/line/util/poi/PoiUtils.java index 05e6e84..1f23179 100644 --- a/src/main/java/com/soft/line/util/poi/PoiUtils.java +++ b/src/main/java/com/soft/line/util/poi/PoiUtils.java @@ -13,9 +13,9 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; +import java.util.*; +import java.util.regex.Matcher; +import java.util.regex.Pattern; public class PoiUtils { @@ -255,8 +255,12 @@ public class PoiUtils { return list; } - public List excel2ContractInfo(MultipartFile file) { + public Map excel2ContractInfo(MultipartFile file) { + Map map = new HashMap(); + String warningMsg=null; + String chgrow = "\r\n"; List contractInfoList = new ArrayList(); + ContractInfo cont = null; try { String fileName = file.getOriginalFilename(); boolean isExcel2003 = true; @@ -264,31 +268,127 @@ public class PoiUtils { isExcel2003 = false; } InputStream is = file.getInputStream(); - Workbook wb = null; + //1. 创建一个 workbook 对象 + Workbook workbook = null; if (isExcel2003) { - wb = new HSSFWorkbook(is); + workbook = new HSSFWorkbook(is); } else { - wb = new XSSFWorkbook(is); - } - Sheet sheet = wb.getSheetAt(0); - if (sheet != null) { - //notNull = true; + workbook = new XSSFWorkbook(is); } - for (int r = 1; r <= sheet.getLastRowNum(); r++) { - Row row = sheet.getRow(r); - if (row == null) { - continue; + //2. 获取 workbook 中表单的数量 + int numberOfSheets = workbook.getNumberOfSheets(); + for (int i = 0; i < numberOfSheets; i++) { + //3. 获取表单 + Sheet sheet = workbook.getSheetAt(i); + //4. 获取表单中的行数 + int physicalNumberOfRows = sheet.getPhysicalNumberOfRows(); + for (int j = 0; j < physicalNumberOfRows; j++) { + //5. 跳过标题行 + if (j == 0) { + continue;//跳过标题行 + } + //6. 获取行 + Row row = sheet.getRow(j); + if (row == null) { + continue;//防止数据中间有空行 + } + //7. 获取列数 + int physicalNumberOfCells = row.getPhysicalNumberOfCells(); + cont = new ContractInfo(); + for (int k = 0; k < physicalNumberOfCells; k++) { + Cell cell = row.getCell(k); + switch (cell.getCellType()) { + case STRING: + String cellValue = cell.getStringCellValue(); + switch (k) { + case 1: + cont.setContractName(cellValue); + break; + + } + break; + default: { + switch (k) { + case 4: + cont.setSignTime(cell.getDateCellValue()); + break; + } + } + break; + } + } + contractInfoList.add(cont); } - System.out.println(row.getCell(0).getStringCellValue()); } } catch (IOException e) { } - return contractInfoList; + return map; } public String dateToString(Date date) { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); return sdf.format(date); } + + //判断是否日期。格式yyyymmdd，基本上把闰年和2月等的情况都考虑进去了 + public boolean matchYMD3(String date){ + String s = "(([0-9]{3}[1-9]|[0-9]{2}[1-9][0-9]{1}|[0-9]{1}[1-9][0-9]{2}|[1-9][0-9]{3})(((0[13578]|1[02])(0[1-9]|[12][0-9]|3[01]))|((0[469]|11)(0[1-9]|[12][0-9]|30))|(02(0[1-9]|[1][0-9]|2[0-8]))))|((([0-9]{2})(0[48]|[2468][048]|[13579][26])|((0[48]|[2468][048]|[3579][26])00))0229)"; + Pattern p = Pattern.compile(s); + Matcher m = p.matcher(date); + if(m.matches()){ + return true; + }else{ + return false; + } + } + + /** + * 判断字符串是否是数字 + */ + public boolean isNumber(String value) { + return isInteger(value) || isDouble(value) || isIntegerDouble(value); + } + + /** + * 判断字符串是否是整数 + */ + public boolean isInteger(String value) { + try { + Integer.parseInt(value); + return true; + } catch (NumberFormatException e) { + return false; + } + } + + /** + * 判断字符串是否是浮点数 + */ + public boolean isDouble(String value) { + try { + Double.parseDouble(value); + if (value.contains(".")) { + return true; + } + return false; + } catch (NumberFormatException e) { + return false; + } + } + + /** + * 判断字符串是否是浮点数(不包含小数点) + */ + public boolean isIntegerDouble(String value) { + try { + Double.parseDouble(value); + if (value.contains(".")) { + return false; + } + return true; + } catch (NumberFormatException e) { + return false; + } + } } -- Gitee From f38ca72f0ee7c73b43b3866c584583f08ad25268 Mon Sep 17 00:00:00 2001 From: ljc Date: Fri, 5 Jun 2020 17:27:16 +0800 Subject: [PATCH 090/211] =?UTF-8?q?=E5=90=88=E5=90=8C=E8=AF=81=E4=B9=A6?= =?UTF-8?q?=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../soft/line/mapper/CodeDetailMapper.java | 2 + .../com/soft/line/mapper/CodeDetailMapper.xml | 8 + .../java/com/soft/line/util/poi/PoiUtils.java | 148 +++++++++--------- 3 files changed, 80 insertions(+), 78 deletions(-) diff --git a/src/main/java/com/soft/line/mapper/CodeDetailMapper.java b/src/main/java/com/soft/line/mapper/CodeDetailMapper.java index ce39449..5660ee6 100644 --- a/src/main/java/com/soft/line/mapper/CodeDetailMapper.java +++ b/src/main/java/com/soft/line/mapper/CodeDetailMapper.java @@ -33,4 +33,6 @@ public interface CodeDetailMapper { List selectAll(); List selectByCodeType(@Param("codeType") String codeType); + + CodeDetail selectByCodeContent1(@Param("codeType") String codeType,@Param("codeContent1") String codeContent1); } \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/CodeDetailMapper.xml b/src/main/java/com/soft/line/mapper/CodeDetailMapper.xml index 28b5b98..09bdbc0 100644 --- a/src/main/java/com/soft/line/mapper/CodeDetailMapper.xml +++ b/src/main/java/com/soft/line/mapper/CodeDetailMapper.xml @@ -48,4 +48,12 @@ where `code_type` = #{codeType,jdbcType=VARCHAR} + + \ No newline at end of file diff --git a/src/main/java/com/soft/line/util/poi/PoiUtils.java b/src/main/java/com/soft/line/util/poi/PoiUtils.java index 1f23179..d9e5646 100644 --- a/src/main/java/com/soft/line/util/poi/PoiUtils.java +++ b/src/main/java/com/soft/line/util/poi/PoiUtils.java @@ -2,9 +2,13 @@ package com.soft.line.util.poi; import com.soft.line.entity.CertificateInfo; import com.soft.line.entity.ContractInfo; +import com.soft.line.mapper.CodeDetailMapper; +import com.soft.line.util.jackson.converter.StringToDateUtil; +import com.soft.line.util.jackson.converter.StringToDoubleUtil; import org.apache.poi.hssf.usermodel.*; import org.apache.poi.ss.usermodel.*; import org.apache.poi.xssf.usermodel.XSSFWorkbook; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; @@ -12,6 +16,7 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; +import java.math.BigDecimal; import java.text.SimpleDateFormat; import java.util.*; import java.util.regex.Matcher; @@ -19,6 +24,9 @@ import java.util.regex.Pattern; public class PoiUtils { + @Autowired + private CodeDetailMapper codeDetailMapper; + public void certificate2Excel(List list, HttpServletResponse response) { String title = "证书信息表"; //创建一个 Excel 文档 @@ -297,98 +305,82 @@ public class PoiUtils { cont = new ContractInfo(); for (int k = 0; k < physicalNumberOfCells; k++) { Cell cell = row.getCell(k); - switch (cell.getCellType()) { - case STRING: - String cellValue = cell.getStringCellValue(); - switch (k) { - case 1: - cont.setContractName(cellValue); - break; - + String cellValue = cell.getStringCellValue(); + switch (k) { + case 1: + //部门 + String depId = codeDetailMapper.selectByCodeContent1("1",cellValue).getCodeContent1(); + if (depId==null||"".equals(depId)){ + warningMsg+="第"+j+"行部门不存在"+chgrow; + }else{ + cont.setDepId(depId); } break; - default: { - switch (k) { - case 4: - cont.setSignTime(cell.getDateCellValue()); - break; + case 2: + //项目类型 + String proId = codeDetailMapper.selectByCodeContent1("2",cellValue).getCodeContent1(); + if (proId==null||"".equals(proId)){ + warningMsg+="第"+j+"行项目类型不存在"+chgrow; + }else{ + cont.setProId(proId); } - } - break; + cont.setProId(cellValue); + break; + case 3: + //合同名称 + cont.setContractName(cellValue); + break; + case 4: + //第一签约方 + cont.setPartA(cellValue); + break; + case 5: + //第二签约方 + cont.setPartB(cellValue); + break; + case 6: + //签约地点 + cont.setSignAddr(cellValue); + break; + case 7: + //签约日期 + cont.setSignTime(StringToDateUtil.convert(cellValue)); + break; + case 8: + //起始日期 + cont.setBeginDate(StringToDateUtil.convert(cellValue)); + break; + case 9: + //终止日期 + cont.setEndDate(StringToDateUtil.convert(cellValue)); + case 10: + //总金额 + cont.setTotalAmount(new BigDecimal(StringToDoubleUtil.convert(cellValue))); + break; + case 11: + //付款方式 + cont.setPayment(cellValue); + break; + case 12: + //备注 + cont.setNote(cellValue); + break; } } contractInfoList.add(cont); } } - } catch (IOException e) { - + } catch (Exception e) { + e.printStackTrace(); } + map.put("warningMsg",warningMsg); + map.put("contractInfoList",contractInfoList); return map; } public String dateToString(Date date) { - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd"); return sdf.format(date); } - //判断是否日期。格式yyyymmdd，基本上把闰年和2月等的情况都考虑进去了 - public boolean matchYMD3(String date){ - String s = "(([0-9]{3}[1-9]|[0-9]{2}[1-9][0-9]{1}|[0-9]{1}[1-9][0-9]{2}|[1-9][0-9]{3})(((0[13578]|1[02])(0[1-9]|[12][0-9]|3[01]))|((0[469]|11)(0[1-9]|[12][0-9]|30))|(02(0[1-9]|[1][0-9]|2[0-8]))))|((([0-9]{2})(0[48]|[2468][048]|[13579][26])|((0[48]|[2468][048]|[3579][26])00))0229)"; - Pattern p = Pattern.compile(s); - Matcher m = p.matcher(date); - if(m.matches()){ - return true; - }else{ - return false; - } - } - - /** - * 判断字符串是否是数字 - */ - public boolean isNumber(String value) { - return isInteger(value) || isDouble(value) || isIntegerDouble(value); - } - - /** - * 判断字符串是否是整数 - */ - public boolean isInteger(String value) { - try { - Integer.parseInt(value); - return true; - } catch (NumberFormatException e) { - return false; - } - } - - /** - * 判断字符串是否是浮点数 - */ - public boolean isDouble(String value) { - try { - Double.parseDouble(value); - if (value.contains(".")) { - return true; - } - return false; - } catch (NumberFormatException e) { - return false; - } - } - - /** - * 判断字符串是否是浮点数(不包含小数点) - */ - public boolean isIntegerDouble(String value) { - try { - Double.parseDouble(value); - if (value.contains(".")) { - return false; - } - return true; - } catch (NumberFormatException e) { - return false; - } - } } -- Gitee From 71cfa75f2fa4cd7a025f710be442e525abd853df Mon Sep 17 00:00:00 2001 From: wuxueqiao <17625808004@163.com> Date: Sat, 6 Jun 2020 09:30:03 +0800 Subject: [PATCH 091/211] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 161 +++++++++--------- softline-files-manage.iml | 35 +--- .../line/SoftlineFilesManageApplication.java | 9 +- .../com/soft/line/service/LoginService.java | 6 +- .../util/config/ResourceConfigAdapter.java | 47 ++--- 5 files changed, 123 insertions(+), 135 deletions(-) diff --git a/pom.xml b/pom.xml index 8125f1e..d003a0c 100644 --- a/pom.xml +++ b/pom.xml @@ -116,16 +116,16 @@ 2.8.0 - - io.github.swagger2markup - swagger2markup - 1.3.1 - - - nl.jworks.markdown_to_asciidoc - markdown_to_asciidoc - 1.0 - + + + + + + + + + + org.pegdown pegdown @@ -189,78 +189,85 @@ 4.1.2 + + org.apache.httpcomponents + httpclient + 4.5.10 + + + - - io.github.swagger2markup - swagger2markup-maven-plugin - 1.3.1 - - - http://localhost:9100/softline/v2/api-docs - src/docs/asciidoc/generated - - - ASCIIDOC - - - - - - org.asciidoctor - asciidoctor-maven-plugin - 1.5.3 - - - - org.asciidoctor - asciidoctorj-pdf - 1.5.0-alpha.11 - - - org.jruby - jruby-complete - 1.7.21 - - - - - src/docs/asciidoc/generated - coderay - - left - - - - - - output-html - generate-resources - - process-asciidoc - - - html5 - src/docs/asciidoc/html - - - - output-pdf - generate-resources - - process-asciidoc - - - pdf - src/docs/asciidoc/pdf - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + org.springframework.boot diff --git a/softline-files-manage.iml b/softline-files-manage.iml index 6a4c8fa..70459be 100644 --- a/softline-files-manage.iml +++ b/softline-files-manage.iml @@ -34,7 +34,7 @@ - + @@ -122,36 +122,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -182,5 +152,8 @@ + + + \ No newline at end of file diff --git a/src/main/java/com/soft/line/SoftlineFilesManageApplication.java b/src/main/java/com/soft/line/SoftlineFilesManageApplication.java index a95de5d..d601c71 100644 --- a/src/main/java/com/soft/line/SoftlineFilesManageApplication.java +++ b/src/main/java/com/soft/line/SoftlineFilesManageApplication.java @@ -4,13 +4,20 @@ import lombok.extern.slf4j.Slf4j; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.web.servlet.ServletComponentScan; +import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; @SpringBootApplication @MapperScan(basePackages = "com.soft.line.mapper") @Slf4j @ServletComponentScan -public class SoftlineFilesManageApplication { +public class SoftlineFilesManageApplication extends SpringBootServletInitializer { + + @Override + protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) { + return builder.sources(SoftlineFilesManageApplication.class); + } public static void main(String[] args) { SpringApplication.run(SoftlineFilesManageApplication.class, args); diff --git a/src/main/java/com/soft/line/service/LoginService.java b/src/main/java/com/soft/line/service/LoginService.java index fd419b5..476b9ca 100644 --- a/src/main/java/com/soft/line/service/LoginService.java +++ b/src/main/java/com/soft/line/service/LoginService.java @@ -14,11 +14,11 @@ import java.util.Map; */ public interface LoginService { - public CommonResult userLogin(Map map); + CommonResult userLogin(Map map); - public CommonResult loginOut(); + CommonResult loginOut(); - public AjaxResult autoLogin(String code); + AjaxResult autoLogin(String code); AjaxResult bindUserInfo(Map map); diff --git a/src/main/java/com/soft/line/util/config/ResourceConfigAdapter.java b/src/main/java/com/soft/line/util/config/ResourceConfigAdapter.java index 85c2f2f..7ee3f9b 100644 --- a/src/main/java/com/soft/line/util/config/ResourceConfigAdapter.java +++ b/src/main/java/com/soft/line/util/config/ResourceConfigAdapter.java @@ -2,6 +2,7 @@ package com.soft.line.util.config; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Configuration; +import org.springframework.stereotype.Component; import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport; @@ -10,27 +11,27 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupp */ @Configuration public class ResourceConfigAdapter extends WebMvcConfigurationSupport { - @Value("${uploadFileDir}") - private String uploadFileDir; - @Value("${uploadFileMapping}") - private String uploadFileMapping; - - @Override - public void addResourceHandlers(ResourceHandlerRegistry registry) { - String os = System.getProperty("os.name"); - if (os.toLowerCase().startsWith("win")) { //如果是Windows系统 - registry.addResourceHandler(uploadFileMapping). - addResourceLocations("file:"+uploadFileDir); - }else{//linux和mac系统 - registry.addResourceHandler(uploadFileMapping). - addResourceLocations("file:/user/softline-files-manage-uploadFiles/"); - } - registry.addResourceHandler("/**").addResourceLocations( - "classpath:/static/"); - registry.addResourceHandler("swagger-ui.html").addResourceLocations( - "classpath:/META-INF/resources/"); - registry.addResourceHandler("/webjars/**").addResourceLocations( - "classpath:/META-INF/resources/webjars/"); - super.addResourceHandlers(registry); - } +// @Value("${uploadFileDir}") +// private String uploadFileDir; +// @Value("${uploadFileMapping}") +// private String uploadFileMapping; +// +// @Override +// public void addResourceHandlers(ResourceHandlerRegistry registry) { +// String os = System.getProperty("os.name"); +// if (os.toLowerCase().startsWith("win")) { //如果是Windows系统 +// registry.addResourceHandler(uploadFileMapping). +// addResourceLocations("file:"+uploadFileDir); +// }else{//linux和mac系统 +// registry.addResourceHandler(uploadFileMapping). +// addResourceLocations("file:/user/softline-files-manage-uploadFiles/"); +// } +// registry.addResourceHandler("/**").addResourceLocations( +// "classpath:/static/"); +// registry.addResourceHandler("swagger-ui.html").addResourceLocations( +// "classpath:/META-INF/resources/"); +// registry.addResourceHandler("/webjars/**").addResourceLocations( +// "classpath:/META-INF/resources/webjars/"); +// super.addResourceHandlers(registry); +// } } -- Gitee From d04d4f05fbf743d901a6ee92c7c6ac2867e195b1 Mon Sep 17 00:00:00 2001 From: ljc <1119265069@qq.com> Date: Sun, 7 Jun 2020 18:12:48 +0800 Subject: [PATCH 092/211] =?UTF-8?q?=E5=90=88=E5=90=8C=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CertificateInfoController.java | 18 +- .../controller/ContractInfoController.java | 22 +- .../line/mapper/CertificateInfoMapper.java | 2 + .../line/mapper/CertificateInfoMapper.xml | 9 + .../soft/line/mapper/ContractInfoMapper.java | 2 + .../soft/line/mapper/ContractInfoMapper.xml | 15 + .../line/service/CertificateInfoService.java | 2 + .../soft/line/service/CodeDetailService.java | 2 + .../line/service/ContractInfoService.java | 2 + .../impl/CertificateInfoServiceImpl.java | 9 + .../service/impl/CodeDetailServiceImpl.java | 5 + .../service/impl/ContractInfoServiceImpl.java | 9 + .../java/com/soft/line/util/poi/PoiUtils.java | 310 +++++++++++++----- 13 files changed, 321 insertions(+), 86 deletions(-) diff --git a/src/main/java/com/soft/line/controller/CertificateInfoController.java b/src/main/java/com/soft/line/controller/CertificateInfoController.java index 66d49bd..7cd4846 100644 --- a/src/main/java/com/soft/line/controller/CertificateInfoController.java +++ b/src/main/java/com/soft/line/controller/CertificateInfoController.java @@ -3,6 +3,7 @@ package com.soft.line.controller; import com.soft.line.entity.CertificateInfo; import com.soft.line.service.CertificateInfoService; +import com.soft.line.service.CodeDetailService; import com.soft.line.util.exception.CommonResult; import com.soft.line.util.exception.ResultData; import com.soft.line.util.jackson.converter.StringToDateUtil; @@ -43,6 +44,8 @@ public class CertificateInfoController { @Autowired private CertificateInfoService certificateInfoService; + @Autowired + private CodeDetailService codeDetailService; /** @@ -109,18 +112,23 @@ public class CertificateInfoController { if (!fileName.matches("^.+\\.(?i)(xls)$") && !fileName.matches("^.+\\.(?i)(xlsx)$")) { return CommonResult.success("上传文件格式错误，请上传后缀为.xls或.xlsx的文件"); } - PoiUtils poiUtils = new PoiUtils(); - List certificateInfoList = poiUtils.excel2Certificate(file); + Map map = PoiUtils.excel2Certificate(file,codeDetailService,certificateInfoService); + String warningMsg = (String)map.get("warningMsg"); + if (warningMsg.length()>0){ + return CommonResult.success(warningMsg); + }else{ + List certificateInfoList = (List)map.get("certificateInfoList"); + certificateInfoService.insertRecord(certificateInfoList); + return CommonResult.success("导入成功"); + } - return CommonResult.success("导入成功"); } @ApiOperation(value = "导出证书", notes = "导出证书") @PostMapping("/certificate/export") public void exportCertificate(@RequestBody Map map,HttpServletResponse response) { - PoiUtils poiUtils = new PoiUtils(); List certificateInfoList = certificateInfoService.getAllByIDList(map); - poiUtils.certificate2Excel(certificateInfoList,response); + PoiUtils.certificate2Excel(certificateInfoList,response); } } diff --git a/src/main/java/com/soft/line/controller/ContractInfoController.java b/src/main/java/com/soft/line/controller/ContractInfoController.java index f3e8bad..5f2686c 100644 --- a/src/main/java/com/soft/line/controller/ContractInfoController.java +++ b/src/main/java/com/soft/line/controller/ContractInfoController.java @@ -1,7 +1,7 @@ package com.soft.line.controller; -import com.soft.line.entity.CertificateInfo; import com.soft.line.entity.ContractInfo; +import com.soft.line.service.CodeDetailService; import com.soft.line.service.ContractInfoService; import com.soft.line.util.exception.CommonResult; import com.soft.line.util.jackson.converter.StringToDateUtil; @@ -15,7 +15,6 @@ import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Map; @@ -33,6 +32,8 @@ public class ContractInfoController { @Autowired private ContractInfoService contractInfoService; + @Autowired + private CodeDetailService codeDetailService; @PostMapping("/getAllAboutContracts") public CommonResult getAllAboutContracts(@RequestBody Map map){ @@ -56,7 +57,7 @@ public class ContractInfoController { @PostMapping("/contract") public CommonResult saveContract(@RequestBody Map map){ if (contractInfoService.countContractByIdAndName((Integer)map.get("id"),(String)map.get("contractName"))>0){ - return CommonResult.success("相同部门相同项目类型下存在相同合同名称"); + return CommonResult.success("存在相同合同名称"); } /*if (!isDouble((String)map.get("totalAmount"))){ @@ -89,18 +90,23 @@ public class ContractInfoController { if (!fileName.matches("^.+\\.(?i)(xls)$") && !fileName.matches("^.+\\.(?i)(xlsx)$")) { return CommonResult.success("上传文件格式错误，请上传后缀为.xls或.xlsx的文件"); } - PoiUtils poiUtils = new PoiUtils(); List contractInfoList = null; - poiUtils.excel2ContractInfo(file); - return CommonResult.success("导入成功"); + Map map = PoiUtils.excel2ContractInfo(file,codeDetailService,contractInfoService); + String warningMsg = (String)map.get("warningMsg"); + if (warningMsg.length()>0){ + return CommonResult.success(warningMsg); + }else{ + contractInfoList = (List)map.get("contractInfoList"); + contractInfoService.insertList(contractInfoList); + return CommonResult.success("导入成功"); + } } @ApiOperation(value = "导出合同", notes = "导出合同") @PostMapping("/contract/export") public void exportContract(@RequestBody Map map, HttpServletResponse response) { - PoiUtils poiUtils = new PoiUtils(); List contractInfoList = contractInfoService.getAllByIDList(map); - poiUtils.contract2Excel(contractInfoList,response); + PoiUtils.contract2Excel(contractInfoList,response); } } diff --git a/src/main/java/com/soft/line/mapper/CertificateInfoMapper.java b/src/main/java/com/soft/line/mapper/CertificateInfoMapper.java index cea98cf..616ace4 100644 --- a/src/main/java/com/soft/line/mapper/CertificateInfoMapper.java +++ b/src/main/java/com/soft/line/mapper/CertificateInfoMapper.java @@ -12,6 +12,8 @@ public interface CertificateInfoMapper { int insert(Map map); + int insertRecord(CertificateInfo record); + int delete(Map map); int update(Map map); diff --git a/src/main/java/com/soft/line/mapper/CertificateInfoMapper.xml b/src/main/java/com/soft/line/mapper/CertificateInfoMapper.xml index 5bc1ade..e441e60 100644 --- a/src/main/java/com/soft/line/mapper/CertificateInfoMapper.xml +++ b/src/main/java/com/soft/line/mapper/CertificateInfoMapper.xml @@ -28,6 +28,15 @@ #{note,jdbcType=VARCHAR}, #{modifyPerson,jdbcType=VARCHAR}) + + insert into `certificate_info` (`cert_id`, `cert_type`, `cert_name`, + `project_name`,`cert_unit`, `begin_date`, `end_date`, + `note`, `modify_person`) + values (#{certId,jdbcType=VARCHAR}, #{certType,jdbcType=VARCHAR}, #{certName,jdbcType=VARCHAR}, + #{projectName,jdbcType=VARCHAR},#{certUnit,jdbcType=VARCHAR}, #{beginDate,jdbcType=TIMESTAMP}, #{endDate,jdbcType=TIMESTAMP}, + #{note,jdbcType=VARCHAR}, #{modifyPerson,jdbcType=VARCHAR}) + + update `certificate_info` set `del_flg` = '1' where `id` = #{id,jdbcType=INTEGER} diff --git a/src/main/java/com/soft/line/mapper/ContractInfoMapper.java b/src/main/java/com/soft/line/mapper/ContractInfoMapper.java index 820bcde..a3e4158 100644 --- a/src/main/java/com/soft/line/mapper/ContractInfoMapper.java +++ b/src/main/java/com/soft/line/mapper/ContractInfoMapper.java @@ -15,6 +15,8 @@ public interface ContractInfoMapper { */ int insert(Map map); + int insertRecord(ContractInfo record); + int delete(Map map); int update(Map map); diff --git a/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml b/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml index c172f34..9e5619e 100644 --- a/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml +++ b/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml @@ -39,6 +39,21 @@ ) + + insert into `contract_info` (`dep_id`, `contract_name`, `pro_id`, + `total_amount`, `part_a`, `part_b`, + `sign_time`, `sign_addr`, `begin_date`, + `end_date`, `payment`, `note`, + `modify_person` + ) + values (#{depId,jdbcType=VARCHAR}, #{contractName,jdbcType=VARCHAR}, #{proId,jdbcType=VARCHAR}, + #{totalAmount,jdbcType=DECIMAL}, #{partA,jdbcType=VARCHAR}, #{partB,jdbcType=VARCHAR}, + #{signTime,jdbcType=TIMESTAMP}, #{signAddr,jdbcType=VARCHAR}, #{beginDate,jdbcType=TIMESTAMP}, + #{endDate,jdbcType=TIMESTAMP}, #{payment,jdbcType=VARCHAR}, #{note,jdbcType=VARCHAR}, + #{modifyPerson,jdbcType=VARCHAR} + ) + + update `contract_info` set `del_flg` = '1' where `id` = #{id,jdbcType=INTEGER} diff --git a/src/main/java/com/soft/line/service/CertificateInfoService.java b/src/main/java/com/soft/line/service/CertificateInfoService.java index 14ea13b..212444d 100644 --- a/src/main/java/com/soft/line/service/CertificateInfoService.java +++ b/src/main/java/com/soft/line/service/CertificateInfoService.java @@ -23,6 +23,8 @@ public interface CertificateInfoService { public void add(final Map map); + public void insertRecord(List list); + public void update(final Map map); public int countByCId(Integer id,String cId); diff --git a/src/main/java/com/soft/line/service/CodeDetailService.java b/src/main/java/com/soft/line/service/CodeDetailService.java index f6c9aec..838a73d 100644 --- a/src/main/java/com/soft/line/service/CodeDetailService.java +++ b/src/main/java/com/soft/line/service/CodeDetailService.java @@ -10,5 +10,7 @@ public interface CodeDetailService { public String selectContent1ByPrimaryKey(String codeType, String codeDetail); + public CodeDetail selectByCodeContent1(String codeType, String codeContent1); + public List selectByCodeType(String codeType); } diff --git a/src/main/java/com/soft/line/service/ContractInfoService.java b/src/main/java/com/soft/line/service/ContractInfoService.java index c99a66b..1bac93a 100644 --- a/src/main/java/com/soft/line/service/ContractInfoService.java +++ b/src/main/java/com/soft/line/service/ContractInfoService.java @@ -22,6 +22,8 @@ public interface ContractInfoService { public void add(Map map); + public void insertList(List list); + public void update(Map map); public int countContractByIdAndName(Integer id,String contractName); diff --git a/src/main/java/com/soft/line/service/impl/CertificateInfoServiceImpl.java b/src/main/java/com/soft/line/service/impl/CertificateInfoServiceImpl.java index fcfd3df..122fed0 100644 --- a/src/main/java/com/soft/line/service/impl/CertificateInfoServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/CertificateInfoServiceImpl.java @@ -70,6 +70,15 @@ public class CertificateInfoServiceImpl implements CertificateInfoService { certificateInfoMapper.update(map); } + @Override + public void insertRecord(List list) { + for(CertificateInfo record:list){ + record.setModifyPerson("admin"); + record.setModifyTime(new Date()); + certificateInfoMapper.insertRecord(record); + } + } + @Override public List getAllByIDList(Map map) { List list = certificateInfoMapper.getAllByIdList((List) map.get("ids")); diff --git a/src/main/java/com/soft/line/service/impl/CodeDetailServiceImpl.java b/src/main/java/com/soft/line/service/impl/CodeDetailServiceImpl.java index 3bd9458..fe6b21a 100644 --- a/src/main/java/com/soft/line/service/impl/CodeDetailServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/CodeDetailServiceImpl.java @@ -25,6 +25,11 @@ public class CodeDetailServiceImpl implements CodeDetailService { return codeDetailMapper.selectContent1ByPrimaryKey(codeType,codeDetail); } + @Override + public CodeDetail selectByCodeContent1(String codeType, String codeContent1) { + return codeDetailMapper.selectByCodeContent1(codeType,codeContent1); + } + @Override public List selectByCodeType(String codeType) { return codeDetailMapper.selectByCodeType(codeType); diff --git a/src/main/java/com/soft/line/service/impl/ContractInfoServiceImpl.java b/src/main/java/com/soft/line/service/impl/ContractInfoServiceImpl.java index 10b032f..ca281d7 100644 --- a/src/main/java/com/soft/line/service/impl/ContractInfoServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/ContractInfoServiceImpl.java @@ -60,6 +60,15 @@ public class ContractInfoServiceImpl implements ContractInfoService{ contractInfoMapper.update(map); } + @Override + public void insertList(List list) { + for (ContractInfo record:list){ + record.setModifyPerson("admin"); + record.setModifyTime(new Date()); + contractInfoMapper.insertRecord(record); + } + } + @Override public int countContractByIdAndName(Integer id, String contractName) { return contractInfoMapper.countContractByIdAndName(id, contractName); diff --git a/src/main/java/com/soft/line/util/poi/PoiUtils.java b/src/main/java/com/soft/line/util/poi/PoiUtils.java index d9e5646..9c7b8b1 100644 --- a/src/main/java/com/soft/line/util/poi/PoiUtils.java +++ b/src/main/java/com/soft/line/util/poi/PoiUtils.java @@ -1,16 +1,21 @@ package com.soft.line.util.poi; import com.soft.line.entity.CertificateInfo; +import com.soft.line.entity.CodeDetail; import com.soft.line.entity.ContractInfo; -import com.soft.line.mapper.CodeDetailMapper; +import com.soft.line.service.CertificateInfoService; +import com.soft.line.service.CodeDetailService; +import com.soft.line.service.ContractInfoService; import com.soft.line.util.jackson.converter.StringToDateUtil; import com.soft.line.util.jackson.converter.StringToDoubleUtil; import org.apache.poi.hssf.usermodel.*; import org.apache.poi.ss.usermodel.*; import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; import org.springframework.web.multipart.MultipartFile; +import javax.annotation.PostConstruct; import javax.servlet.http.HttpServletResponse; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -24,10 +29,7 @@ import java.util.regex.Pattern; public class PoiUtils { - @Autowired - private CodeDetailMapper codeDetailMapper; - - public void certificate2Excel(List list, HttpServletResponse response) { + public static void certificate2Excel(List list, HttpServletResponse response) { String title = "证书信息表"; //创建一个 Excel 文档 HSSFWorkbook workbook = new HSSFWorkbook(); @@ -101,7 +103,7 @@ public class PoiUtils { } } - public void contract2Excel(List list, HttpServletResponse response) { + public static void contract2Excel(List list, HttpServletResponse response) { String title = "合同信息表"; //创建一个 Excel 文档 HSSFWorkbook workbook = new HSSFWorkbook(); @@ -191,9 +193,12 @@ public class PoiUtils { } } - public List excel2Certificate(MultipartFile file) { - List list = new ArrayList(); + public static Map excel2Certificate(MultipartFile file,CodeDetailService codeDetailService,CertificateInfoService certificateInfoService) { + List certificateInfoList = new ArrayList(); CertificateInfo cert = null; + Map map = new HashMap(); + String warningMsg=null; + String chgrow = "\r\n"; try { String fileName = file.getOriginalFilename(); boolean isExcel2003 = true; @@ -201,17 +206,18 @@ public class PoiUtils { isExcel2003 = false; } InputStream is = file.getInputStream(); - Workbook wb = null; + //1. 创建一个 workbook 对象 + Workbook workbook = null; if (isExcel2003) { - wb = new HSSFWorkbook(is); + workbook = new HSSFWorkbook(is); } else { - wb = new XSSFWorkbook(is); + workbook = new XSSFWorkbook(is); } //2. 获取 workbook 中表单的数量 - int numberOfSheets = wb.getNumberOfSheets(); + int numberOfSheets = workbook.getNumberOfSheets(); for (int i = 0; i < numberOfSheets; i++) { //3. 获取表单 - Sheet sheet = wb.getSheetAt(i); + Sheet sheet = workbook.getSheetAt(i); //4. 获取表单中的行数 int physicalNumberOfRows = sheet.getPhysicalNumberOfRows(); for (int j = 0; j < physicalNumberOfRows; j++) { @@ -229,44 +235,90 @@ public class PoiUtils { cert = new CertificateInfo(); for (int k = 0; k < physicalNumberOfCells; k++) { Cell cell = row.getCell(k); - switch (cell.getCellType()) { - case STRING: - String cellValue = cell.getStringCellValue(); - switch (k) { - case 1: - mysql: - cert.setCertName(cellValue); - break; - case 2: - cert.setCertId(cellValue); - break; - + String cellValue = cell.getStringCellValue(); + CodeDetail cd = null; + switch (k) { + case 0: + //证书类型 + cd = codeDetailService.selectByCodeContent1("3",cellValue); + if (cd==null){ + warningMsg+="第"+j+"行证书类型不存在"; + }else{ + cert.setCertType(cd.getCodeDetail()); } break; - default: { - switch (k) { - case 4: - //cert.getBeginDate(cell.getDateCellValue()); - break; - + case 1: + //证书名称 + if (cellValue==null||"".equals(cellValue)){ + warningMsg+="第"+j+"行证书名称不存在"; + }else{ + cert.setCertName(cellValue); + } + break; + case 2: + //项目名称 + cert.setProjectName(cellValue); + break; + case 3: + //颁奖单位 + if (cellValue == null || "".equals(cellValue)) { + warningMsg += "第" + j + "行颁奖单位为空" ; + } else { + cert.setCertUnit(cellValue); + } + break; + case 4: + //证书编号 + if (cellValue == null || "".equals(cellValue)) { + warningMsg += "第" + j + "行证书编号为空" ; + }else if(certificateInfoService.countByCId(null, cellValue) > 0){ + warningMsg += "第" + j + "行存在相同的证书编号" ; + } else { + cert.setCertId(cellValue); } break; - } + case 5: + //发证日期 + if(!isDate(cellValue)){ + warningMsg += "第" + j + "行发证日期格式错误!日期样式：【20100101】" ; + }else{ + cert.setBeginDate(StringToDateUtil.convert(cellValue)); + } + break; + case 6: + //到期日期 + if (!isDate(cellValue)) { + warningMsg += "第" + j + "行到期日期格式错误!日期样式：【20100101】"; + } else { + cert.setEndDate(StringToDateUtil.convert(cellValue)); + } + if (cert.getBeginDate() != null && cert.getEndDate() != null) { + if (cert.getBeginDate().after(cert.getEndDate())) { + warningMsg += "第" + j + "行发证日期大于到期日期"; + } + } + break; + case 7: + //备注 + cert.setNote(cellValue); + break; } - list.add(cert); } + certificateInfoList.add(cert); } - }} catch (IOException e) { + } + map.put("warningMsg",warningMsg); + map.put("certificateInfoList",certificateInfoList); + } catch (IOException e) { e.printStackTrace(); + }finally { + return map; } - - return list; } - public Map excel2ContractInfo(MultipartFile file) { + public static Map excel2ContractInfo(MultipartFile file,CodeDetailService codeDetailService,ContractInfoService contractInfoService) { Map map = new HashMap(); - String warningMsg=null; - String chgrow = "\r\n"; + String warningMsg=""; List contractInfoList = new ArrayList(); ContractInfo cont = null; try { @@ -305,63 +357,111 @@ public class PoiUtils { cont = new ContractInfo(); for (int k = 0; k < physicalNumberOfCells; k++) { Cell cell = row.getCell(k); + cell.setCellType(CellType.STRING); String cellValue = cell.getStringCellValue(); + CodeDetail cd = null; switch (k) { - case 1: + case 0: //部门 - String depId = codeDetailMapper.selectByCodeContent1("1",cellValue).getCodeContent1(); - if (depId==null||"".equals(depId)){ - warningMsg+="第"+j+"行部门不存在"+chgrow; + cd = codeDetailService.selectByCodeContent1("1",cellValue); + if (cd==null){ + warningMsg+="第"+j+"行部门不存在"; }else{ - cont.setDepId(depId); + cont.setDepId(cd.getCodeDetail()); } break; - case 2: + case 1: //项目类型 - String proId = codeDetailMapper.selectByCodeContent1("2",cellValue).getCodeContent1(); - if (proId==null||"".equals(proId)){ - warningMsg+="第"+j+"行项目类型不存在"+chgrow; + cd = codeDetailService.selectByCodeContent1("2",cellValue); + if (cd==null){ + warningMsg+="第"+j+"行项目类型不存在"; }else{ - cont.setProId(proId); + cont.setProId(cd.getCodeDetail()); } - cont.setProId(cellValue); break; - case 3: + case 2: //合同名称 - cont.setContractName(cellValue); + if(cellValue==null||"".equals(cellValue)){ + warningMsg+="第"+j+"行合同名称为空"; + }else if(contractInfoService.countContractByIdAndName(null,cellValue)>0){ + warningMsg+="第"+j+"行存在相同的合同名称"; + } + else{ + cont.setContractName(cellValue); + } break; - case 4: + case 3: //第一签约方 - cont.setPartA(cellValue); + if (cellValue == null || "".equals(cellValue)) { + warningMsg += "第" + j + "行第一签约方为空" ; + } else { + cont.setPartA(cellValue); + } break; - case 5: + case 4: //第二签约方 - cont.setPartB(cellValue); + if (cellValue == null || "".equals(cellValue)) { + warningMsg += "第" + j + "行第二签约方为空" ; + } else { + cont.setPartB(cellValue); + } break; - case 6: + case 5: //签约地点 - cont.setSignAddr(cellValue); + if (cellValue == null || "".equals(cellValue)) { + warningMsg += "第" + j + "行签约地点为空" ; + } else { + cont.setSignAddr(cellValue); + } break; - case 7: + case 6: //签约日期 - cont.setSignTime(StringToDateUtil.convert(cellValue)); + if(!isDate(cellValue)){ + warningMsg += "第" + j + "行签约日期格式错误!日期样式：【20100101】" ; + }else{ + cont.setSignTime(StringToDateUtil.convert(cellValue)); + } break; - case 8: + case 7: //起始日期 - cont.setBeginDate(StringToDateUtil.convert(cellValue)); + if(!isDate(cellValue)){ + warningMsg += "第" + j + "行起始日期格式错误!日期样式：【20100101】" ; + }else{ + cont.setBeginDate(StringToDateUtil.convert(cellValue)); + } break; - case 9: + case 8: //终止日期 - cont.setEndDate(StringToDateUtil.convert(cellValue)); - case 10: + if(!isDate(cellValue)){ + warningMsg += "第" + j + "行终止日期格式错误!日期样式：【20100101】" ; + }else{ + cont.setEndDate(StringToDateUtil.convert(cellValue)); + } + if (cont.getBeginDate()!=null&&cont.getEndDate()!=null){ + if(cont.getBeginDate().after(cont.getEndDate())){ + warningMsg += "第" + j + "行起始日期大于终止日期" ; + } + } + break; + case 9: //总金额 - cont.setTotalAmount(new BigDecimal(StringToDoubleUtil.convert(cellValue))); + if (cellValue == null || "".equals(cellValue)) { + warningMsg += "第" + j + "行总金额为空" ; + } else if(!isNumber(cellValue)){ + warningMsg += "第" + j + "行总金额不是数字" ; + }else { + cont.setTotalAmount(new BigDecimal(StringToDoubleUtil.convert(cellValue))); + } break; - case 11: + case 10: //付款方式 - cont.setPayment(cellValue); + if (cellValue == null || "".equals(cellValue)) { + warningMsg += "第" + j + "行付款方式为空" ; + } else { + cont.setPayment(cellValue); + } break; - case 12: + case 11: //备注 cont.setNote(cellValue); break; @@ -370,17 +470,81 @@ public class PoiUtils { contractInfoList.add(cont); } } + map.put("warningMsg",warningMsg); + map.put("contractInfoList",contractInfoList); } catch (Exception e) { e.printStackTrace(); } - map.put("warningMsg",warningMsg); - map.put("contractInfoList",contractInfoList); - return map; + finally { + return map; + } } - public String dateToString(Date date) { + public static String dateToString(Date date) { SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd"); return sdf.format(date); } + /** + * 判断字符串是否是数字 + */ + public static boolean isNumber(String value) { + return isInteger(value) || isDouble(value) || isIntegerDouble(value); + } + + /** + * 判断字符串是否是整数 + */ + public static boolean isInteger(String value) { + try { + Integer.parseInt(value); + return true; + } catch (NumberFormatException e) { + return false; + } + } + + /** + * 判断字符串是否是浮点数 + */ + public static boolean isDouble(String value) { + try { + Double.parseDouble(value); + if (value.contains(".")) { + return true; + } + return false; + } catch (NumberFormatException e) { + return false; + } + } + + /** + * 判断字符串是否是浮点数(不包含小数点) + */ + public static boolean isIntegerDouble(String value) { + try { + Double.parseDouble(value); + if (value.contains(".")) { + return false; + } + return true; + } catch (NumberFormatException e) { + return false; + } + } + + //判断是否日期。格式yyyymmdd，基本上把闰年和2月等的情况都考虑进去了 + public static boolean isDate(String date){ +// String s = "^((((1[6-9]|[2-9]\\d)\\d{2})(0?[13578]|1[02])(0?[1-9]|[12]\\d|3[01]))|(((1[6-9]|[2-9]\\d)\\d{2})(0?[13456789]|1[012])(0?[1-9]|[12]\\d|30))|(((1[6-9]|[2-9]\\d)\\d{2})0?2(0?[1-9]|1\\d|2[0-8]))|(((1[6-9]|[2-9]\\d)(0[48]|[2468][048]|[13579][26])|((16|[2468][048]|[3579][26])00))0?229))$"; + String s = "(([0-9]{3}[1-9]|[0-9]{2}[1-9][0-9]{1}|[0-9]{1}[1-9][0-9]{2}|[1-9][0-9]{3})(((0[13578]|1[02])(0[1-9]|[12][0-9]|3[01]))|((0[469]|11)(0[1-9]|[12][0-9]|30))|(02(0[1-9]|[1][0-9]|2[0-8]))))|((([0-9]{2})(0[48]|[2468][048]|[13579][26])|((0[48]|[2468][048]|[3579][26])00))0229)"; + Pattern p = Pattern.compile(s); + Matcher m = p.matcher(date); + if(m.matches()){ + return true; + }else{ + return false; + } + } + } -- Gitee From af679feac7c459b014a7d9e760946c4a058b7ab5 Mon Sep 17 00:00:00 2001 From: ljc <1119265069@qq.com> Date: Sun, 7 Jun 2020 23:46:44 +0800 Subject: [PATCH 093/211] =?UTF-8?q?=E9=99=84=E4=BB=B6=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../line/controller/AttachmentController.java | 34 +++-- .../com/soft/line/entity/AttachmentInfo.java | 137 +++--------------- .../line/mapper/AttachmentInfoMapper.java | 8 +- .../soft/line/mapper/AttachmentInfoMapper.xml | 37 +++-- .../line/service/AttachMentInfoService.java | 17 +++ .../impl/AttachmentInfoServiceImpl.java | 70 +++++++++ .../impl/CertificateInfoServiceImpl.java | 5 + .../service/impl/ContractInfoServiceImpl.java | 4 + .../java/com/soft/line/util/FileUtil.java | 46 ++++++ .../util/config/ResourceConfigAdapter.java | 49 ++++--- 10 files changed, 245 insertions(+), 162 deletions(-) create mode 100644 src/main/java/com/soft/line/service/AttachMentInfoService.java create mode 100644 src/main/java/com/soft/line/service/impl/AttachmentInfoServiceImpl.java create mode 100644 src/main/java/com/soft/line/util/FileUtil.java diff --git a/src/main/java/com/soft/line/controller/AttachmentController.java b/src/main/java/com/soft/line/controller/AttachmentController.java index 2ce9b9c..55069e2 100644 --- a/src/main/java/com/soft/line/controller/AttachmentController.java +++ b/src/main/java/com/soft/line/controller/AttachmentController.java @@ -1,14 +1,15 @@ package com.soft.line.controller; +import com.soft.line.service.AttachMentInfoService; import com.soft.line.util.exception.CommonResult; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.apache.ibatis.annotations.Param; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; import java.util.Map; @@ -18,12 +19,25 @@ import java.util.Map; @RequestMapping("/attachment") public class AttachmentController { - /*@Value("${uploadFileDir}") - private String uploadFileDir; + @Autowired + private AttachMentInfoService attachMentInfoService; - @ApiOperation(value = "获取所有证书列表", notes = "获取所有证书列表") + @ApiOperation(value = "获取附件列表", notes = "获取附件列表") + @PostMapping("/attachment/{attachmentType}/{id} ") + public CommonResult getAll(@PathVariable("attachmentType") String attachmentType,@PathVariable("id") Integer id){ + return CommonResult.success(attachMentInfoService.selectAll(attachmentType,id)); + } + + @ApiOperation(value = "删除附件", notes = "删除附件") + @PostMapping("/attachment") + public CommonResult delete(@RequestBody Map map){ + attachMentInfoService.delete(map); + return CommonResult.success("删除成功"); + } + + @ApiOperation(value = "上传附件", notes = "上传附件") @PostMapping("/upload") - public CommonResult uploadDir(@RequestBody Map map){ - return CommonResult.success(uploadFileDir); - }*/ + public CommonResult upload(MultipartFile[] uploadFiles,@RequestBody Map map){ + return CommonResult.success(attachMentInfoService.save(uploadFiles,map)); + } } diff --git a/src/main/java/com/soft/line/entity/AttachmentInfo.java b/src/main/java/com/soft/line/entity/AttachmentInfo.java index d39d8b9..385bf8e 100644 --- a/src/main/java/com/soft/line/entity/AttachmentInfo.java +++ b/src/main/java/com/soft/line/entity/AttachmentInfo.java @@ -5,164 +5,75 @@ import com.fasterxml.jackson.annotation.JsonFormat; import java.util.Date; public class AttachmentInfo { - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column attachment_info.id - * - * @mbggenerated - */ + private Integer id; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column attachment_info.attachment_name - * - * @mbggenerated - */ private String attachmentName; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column attachment_info.attachment_url - * - * @mbggenerated - */ private String attachmentUrl; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column attachment_info.modify_person - * - * @mbggenerated - */ private String modifyPerson; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column attachment_info.modify_time - * - * @mbggenerated - */ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "Asia/Shanghai") private Date modifyTime; - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column attachment_info.id - * - * @return the value of attachment_info.id - * - * @mbggenerated - */ + private String type; + + private Integer cId; + public Integer getId() { return id; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column attachment_info.id - * - * @param id the value for attachment_info.id - * - * @mbggenerated - */ public void setId(Integer id) { this.id = id; } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column attachment_info.attachment_name - * - * @return the value of attachment_info.attachment_name - * - * @mbggenerated - */ public String getAttachmentName() { return attachmentName; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column attachment_info.attachment_name - * - * @param attachmentName the value for attachment_info.attachment_name - * - * @mbggenerated - */ public void setAttachmentName(String attachmentName) { this.attachmentName = attachmentName == null ? null : attachmentName.trim(); } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column attachment_info.attachment_url - * - * @return the value of attachment_info.attachment_url - * - * @mbggenerated - */ - public String getattachmentUrl() { + public String getAttachmentUrl() { return attachmentUrl; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column attachment_info.attachment_url - * - * @param attachmentUrl the value for attachment_info.attachment_url - * - * @mbggenerated - */ - public void setattachmentUrl(String attachmentUrl) { - this.attachmentUrl = attachmentUrl == null ? null : attachmentUrl.trim(); + public void setAttachmentUrl(String attachmentUrl) { + this.attachmentUrl = attachmentUrl == null ? null : attachmentUrl.trim();; } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column attachment_info.modify_person - * - * @return the value of attachment_info.modify_person - * - * @mbggenerated - */ public String getModifyPerson() { return modifyPerson; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column attachment_info.modify_person - * - * @param modifyPerson the value for attachment_info.modify_person - * - * @mbggenerated - */ public void setModifyPerson(String modifyPerson) { this.modifyPerson = modifyPerson == null ? null : modifyPerson.trim(); } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column attachment_info.modify_time - * - * @return the value of attachment_info.modify_time - * - * @mbggenerated - */ public Date getModifyTime() { return modifyTime; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column attachment_info.modify_time - * - * @param modifyTime the value for attachment_info.modify_time - * - * @mbggenerated - */ public void setModifyTime(Date modifyTime) { this.modifyTime = modifyTime; } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public Integer getcId() { + return cId; + } + + public void setcId(Integer cId) { + this.cId = cId; + } } \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/AttachmentInfoMapper.java b/src/main/java/com/soft/line/mapper/AttachmentInfoMapper.java index 7714ec3..39fa749 100644 --- a/src/main/java/com/soft/line/mapper/AttachmentInfoMapper.java +++ b/src/main/java/com/soft/line/mapper/AttachmentInfoMapper.java @@ -2,8 +2,10 @@ package com.soft.line.mapper; import com.soft.line.entity.AttachmentInfo; +import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Map; public interface AttachmentInfoMapper { /** @@ -14,6 +16,10 @@ public interface AttachmentInfoMapper { */ int insert(AttachmentInfo record); + int delete(@Param("attachmentType") String attachmentType,@Param("cId") Integer cId); + + int deleteFile(Map map); + /** * This method was generated by MyBatis Generator. * This method corresponds to the database table attachment_info @@ -28,5 +34,5 @@ public interface AttachmentInfoMapper { * * @mbggenerated */ - List selectAll(); + List selectAll(@Param("attachmentType") String attachmentType,@Param("cId") Integer cId); } \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/AttachmentInfoMapper.xml b/src/main/java/com/soft/line/mapper/AttachmentInfoMapper.xml index 5b1c01a..624fabe 100644 --- a/src/main/java/com/soft/line/mapper/AttachmentInfoMapper.xml +++ b/src/main/java/com/soft/line/mapper/AttachmentInfoMapper.xml @@ -11,32 +11,39 @@ + + - insert into `attachment_info` (`attachment_name`, `attachment_url`, `modify_person`, - `modify_time`) + `modify_time`,`type`,`c_id`) values (#{attachmentName,jdbcType=VARCHAR}, #{attachmentUrl,jdbcType=VARCHAR}, #{modifyPerson,jdbcType=VARCHAR}, - #{modifyTime,jdbcType=TIMESTAMP}) + #{modifyTime,jdbcType=TIMESTAMP}),#{type,jdbcType=VARCHAR},#{cId,jdbcType=INTEGER} + + + delete from `attachment_info` where `type` = #{attachmentType} and `c_id` = #{cId} + + + + delete from `attachment_info` where `type` = #{type} and `c_id` = #{cId} and `id` = #{id} + + + \ No newline at end of file diff --git a/src/main/java/com/soft/line/service/AttachMentInfoService.java b/src/main/java/com/soft/line/service/AttachMentInfoService.java new file mode 100644 index 0000000..57e38a5 --- /dev/null +++ b/src/main/java/com/soft/line/service/AttachMentInfoService.java @@ -0,0 +1,17 @@ +package com.soft.line.service; + +import com.soft.line.entity.AttachmentInfo; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.multipart.MultipartFile; + +import java.util.List; +import java.util.Map; + +public interface AttachMentInfoService { + + public List selectAll(String attachmentType,Integer cId); + + public void delete(Map map); + + public String save(MultipartFile[] uploadFiles,Map map); +} diff --git a/src/main/java/com/soft/line/service/impl/AttachmentInfoServiceImpl.java b/src/main/java/com/soft/line/service/impl/AttachmentInfoServiceImpl.java new file mode 100644 index 0000000..61cdac0 --- /dev/null +++ b/src/main/java/com/soft/line/service/impl/AttachmentInfoServiceImpl.java @@ -0,0 +1,70 @@ +package com.soft.line.service.impl; + +import com.soft.line.entity.AttachmentInfo; +import com.soft.line.mapper.AttachmentInfoMapper; +import com.soft.line.service.AttachMentInfoService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +@Service +@Slf4j +public class AttachmentInfoServiceImpl implements AttachMentInfoService { + + private String[] docTypes = new String[]{ + "DOC","DOCX" ,"XLS","XLSX","PPT","PPTX","PDF" + }; + + private String[] imgTypes = new String[]{ + "JPG","JPEG","PNG","BMP" + }; + + @Autowired + private AttachmentInfoMapper attachmentInfoMapper; + + @Override + public List selectAll(String attachmentType,Integer cId) { + return attachmentInfoMapper.selectAll(attachmentType,cId); + } + + @Override + public void delete(Map map) { + attachmentInfoMapper.deleteFile(map); + } + + @Override + public String save(MultipartFile[] uploadFiles, Map map) { + List samelist = new ArrayList(); + List samelistonly = new ArrayList(); + String warningMsg = ""; + for (MultipartFile file:uploadFiles){ + String fileName = file.getOriginalFilename(); + if(!samelist.contains(fileName)){ + samelist.add(fileName); + }else{ + if (!samelistonly.contains(fileName)) { + samelistonly.add(fileName); + } + } + String contentType=file.getContentType().toUpperCase(); + if(!Arrays.asList(docTypes).contains(contentType)&&!Arrays.asList(imgTypes).contains(contentType)){ + warningMsg += "上传文件格式不正确"; + } + } + if (samelistonly.size()>0){ + warningMsg += "上传文件中存重复的数据:"+String.join(",", samelistonly); + } + if (warningMsg.length()>0){ + return warningMsg; + }else{ + //上传 + return "上传成功"; + } + } +} diff --git a/src/main/java/com/soft/line/service/impl/CertificateInfoServiceImpl.java b/src/main/java/com/soft/line/service/impl/CertificateInfoServiceImpl.java index 122fed0..4ff09ff 100644 --- a/src/main/java/com/soft/line/service/impl/CertificateInfoServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/CertificateInfoServiceImpl.java @@ -2,6 +2,7 @@ package com.soft.line.service.impl; import com.github.pagehelper.PageInfo; import com.soft.line.entity.CertificateInfo; +import com.soft.line.mapper.AttachmentInfoMapper; import com.soft.line.mapper.CertificateInfoMapper; import com.soft.line.service.CertificateInfoService; import com.soft.line.util.pagehelper.PageUtil; @@ -24,6 +25,9 @@ public class CertificateInfoServiceImpl implements CertificateInfoService { @Autowired private CertificateInfoMapper certificateInfoMapper; + @Autowired + private AttachmentInfoMapper attachmentInfoMapper; + @Override public List getPersonalAll(String userName) { return certificateInfoMapper.getPersonalAll(userName); @@ -50,6 +54,7 @@ public class CertificateInfoServiceImpl implements CertificateInfoService { @Override public void delete(Map map) { certificateInfoMapper.delete(map); + attachmentInfoMapper.delete("2",(Integer)map.get("id")); } @Override diff --git a/src/main/java/com/soft/line/service/impl/ContractInfoServiceImpl.java b/src/main/java/com/soft/line/service/impl/ContractInfoServiceImpl.java index ca281d7..e881caf 100644 --- a/src/main/java/com/soft/line/service/impl/ContractInfoServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/ContractInfoServiceImpl.java @@ -2,6 +2,7 @@ package com.soft.line.service.impl; import com.github.pagehelper.PageInfo; import com.soft.line.entity.ContractInfo; +import com.soft.line.mapper.AttachmentInfoMapper; import com.soft.line.mapper.ContractInfoMapper; import com.soft.line.service.ContractInfoService; import com.soft.line.util.pagehelper.PageUtil; @@ -22,6 +23,8 @@ import java.util.Map; public class ContractInfoServiceImpl implements ContractInfoService{ @Autowired private ContractInfoMapper contractInfoMapper; + @Autowired + private AttachmentInfoMapper attachmentInfoMapper; @Override @@ -45,6 +48,7 @@ public class ContractInfoServiceImpl implements ContractInfoService{ @Override public void delete(Map map) { contractInfoMapper.delete(map); + attachmentInfoMapper.delete("1",(Integer)map.get("id")); } @Override diff --git a/src/main/java/com/soft/line/util/FileUtil.java b/src/main/java/com/soft/line/util/FileUtil.java new file mode 100644 index 0000000..896ea2d --- /dev/null +++ b/src/main/java/com/soft/line/util/FileUtil.java @@ -0,0 +1,46 @@ +package com.soft.line.util; + +import org.springframework.web.multipart.MultipartFile; + +import java.io.File; + +public class FileUtil { + + public static String saveFile(MultipartFile file, String pathname) { + try { + File targetFile = new File(pathname); + if (targetFile.exists()) { + return pathname; + } + + if (!targetFile.getParentFile().exists()) { + targetFile.getParentFile().mkdirs(); + } + file.transferTo(targetFile); + + return pathname; + } catch (Exception e) { + e.printStackTrace(); + } + + return null; + } + + public static boolean deleteFile(String pathname) { + File file = new File(pathname); + if (file.exists()) { + boolean flag = file.delete(); + + if (flag) { + File[] files = file.getParentFile().listFiles(); + if (files == null || files.length == 0) { + file.getParentFile().delete(); + } + } + + return flag; + } + + return false; + } +} diff --git a/src/main/java/com/soft/line/util/config/ResourceConfigAdapter.java b/src/main/java/com/soft/line/util/config/ResourceConfigAdapter.java index 7ee3f9b..45458d2 100644 --- a/src/main/java/com/soft/line/util/config/ResourceConfigAdapter.java +++ b/src/main/java/com/soft/line/util/config/ResourceConfigAdapter.java @@ -3,35 +3,38 @@ package com.soft.line.util.config; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Configuration; import org.springframework.stereotype.Component; +import org.springframework.util.ResourceUtils; import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport; +import java.io.File; + /** * 文件绝对地址与虚拟地址映射 */ @Configuration public class ResourceConfigAdapter extends WebMvcConfigurationSupport { -// @Value("${uploadFileDir}") -// private String uploadFileDir; -// @Value("${uploadFileMapping}") -// private String uploadFileMapping; -// -// @Override -// public void addResourceHandlers(ResourceHandlerRegistry registry) { -// String os = System.getProperty("os.name"); -// if (os.toLowerCase().startsWith("win")) { //如果是Windows系统 -// registry.addResourceHandler(uploadFileMapping). -// addResourceLocations("file:"+uploadFileDir); -// }else{//linux和mac系统 -// registry.addResourceHandler(uploadFileMapping). -// addResourceLocations("file:/user/softline-files-manage-uploadFiles/"); -// } -// registry.addResourceHandler("/**").addResourceLocations( -// "classpath:/static/"); -// registry.addResourceHandler("swagger-ui.html").addResourceLocations( -// "classpath:/META-INF/resources/"); -// registry.addResourceHandler("/webjars/**").addResourceLocations( -// "classpath:/META-INF/resources/webjars/"); -// super.addResourceHandlers(registry); -// } + @Value("${uploadFileDir}") + private String uploadFileDir; + @Value("${uploadFileMapping}") + private String uploadFileMapping; + + @Override + public void addResourceHandlers(ResourceHandlerRegistry registry) { + String os = System.getProperty("os.name"); + if (os.toLowerCase().startsWith("win")) { //如果是Windows系统 + registry.addResourceHandler(uploadFileMapping). + addResourceLocations(ResourceUtils.FILE_URL_PREFIX +uploadFileDir+ File.separator); + }else{//linux和mac系统 + registry.addResourceHandler(uploadFileMapping). + addResourceLocations(ResourceUtils.FILE_URL_PREFIX+"/user/softline-files-manage-uploadFiles/"+ File.separator); + } + registry.addResourceHandler("/**").addResourceLocations( + "classpath:/static/"); + registry.addResourceHandler("swagger-ui.html").addResourceLocations( + "classpath:/META-INF/resources/"); + registry.addResourceHandler("/webjars/**").addResourceLocations( + "classpath:/META-INF/resources/webjars/"); + super.addResourceHandlers(registry); + } } -- Gitee From e79a687874b165d6e355e72ec21cfe26c4b394d9 Mon Sep 17 00:00:00 2001 From: ljc <1119265069@qq.com> Date: Sun, 7 Jun 2020 23:54:16 +0800 Subject: [PATCH 094/211] =?UTF-8?q?=E9=99=84=E4=BB=B6=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/soft/line/controller/AttachmentController.java | 6 ++++++ .../java/com/soft/line/mapper/AttachmentInfoMapper.java | 2 ++ .../java/com/soft/line/mapper/AttachmentInfoMapper.xml | 7 ++++++- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/soft/line/controller/AttachmentController.java b/src/main/java/com/soft/line/controller/AttachmentController.java index 55069e2..9175ba1 100644 --- a/src/main/java/com/soft/line/controller/AttachmentController.java +++ b/src/main/java/com/soft/line/controller/AttachmentController.java @@ -40,4 +40,10 @@ public class AttachmentController { public CommonResult upload(MultipartFile[] uploadFiles,@RequestBody Map map){ return CommonResult.success(attachMentInfoService.save(uploadFiles,map)); } + + @ApiOperation(value = "上传附件检查", notes = "上传附件检查") + @PostMapping("/uploadCheck") + public CommonResult uploadCheck(MultipartFile[] uploadFiles,@RequestBody Map map){ + return CommonResult.success(attachMentInfoService.save(uploadFiles,map)); + } } diff --git a/src/main/java/com/soft/line/mapper/AttachmentInfoMapper.java b/src/main/java/com/soft/line/mapper/AttachmentInfoMapper.java index 39fa749..d731eef 100644 --- a/src/main/java/com/soft/line/mapper/AttachmentInfoMapper.java +++ b/src/main/java/com/soft/line/mapper/AttachmentInfoMapper.java @@ -35,4 +35,6 @@ public interface AttachmentInfoMapper { * @mbggenerated */ List selectAll(@Param("attachmentType") String attachmentType,@Param("cId") Integer cId); + + List selectAllByTypeAndName(@Param("attachmentType") String attachmentType,@Param("attachmentName") String attachmentName); } \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/AttachmentInfoMapper.xml b/src/main/java/com/soft/line/mapper/AttachmentInfoMapper.xml index 624fabe..d49f5d7 100644 --- a/src/main/java/com/soft/line/mapper/AttachmentInfoMapper.xml +++ b/src/main/java/com/soft/line/mapper/AttachmentInfoMapper.xml @@ -36,7 +36,7 @@ + + \ No newline at end of file -- Gitee From d6e999b80bf7294dde0b98f4db296816d4ab51d4 Mon Sep 17 00:00:00 2001 From: wpb <1121178778@qq.com> Date: Tue, 9 Jun 2020 10:45:49 +0800 Subject: [PATCH 095/211] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E5=90=88?= =?UTF-8?q?=E5=90=8C=E3=80=81=E8=AF=81=E4=B9=A6=E4=BB=A5=E5=8F=8A=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E6=96=87=E4=BB=B6=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../line/common/AppletSystemConstant.java | 146 ++++++++ .../line/common/GlobalExceptionHandler.java | 74 ++++ .../com/soft/line/common/WebMvcConfig.java | 27 ++ .../AppletCertificateController.java | 169 +++++++++ .../controller/AppletCommonController.java | 105 ++++++ .../controller/AppletContractController.java | 169 +++++++++ .../line/mapper/AppletCertificateMapper.java | 130 +++++++ .../line/mapper/AppletCertificateMapper.xml | 243 +++++++++++++ .../soft/line/mapper/AppletCommonMapper.java | 72 ++++ .../soft/line/mapper/AppletCommonMapper.xml | 44 +++ .../line/mapper/AppletContractMapper.java | 132 ++++++++ .../soft/line/mapper/AppletContractMapper.xml | 203 +++++++++++ .../service/AppletCertificateService.java | 81 +++++ .../line/service/AppletCommonService.java | 47 +++ .../line/service/AppletContractService.java | 92 +++++ .../impl/AppletCertificateServiceImpl.java | 299 ++++++++++++++++ .../service/impl/AppletCommonServiceImpl.java | 177 ++++++++++ .../impl/AppletContractServiceImpl.java | 320 ++++++++++++++++++ src/main/resources/application.properties | 12 +- 19 files changed, 2541 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/soft/line/common/AppletSystemConstant.java create mode 100644 src/main/java/com/soft/line/common/GlobalExceptionHandler.java create mode 100644 src/main/java/com/soft/line/common/WebMvcConfig.java create mode 100644 src/main/java/com/soft/line/controller/AppletCertificateController.java create mode 100644 src/main/java/com/soft/line/controller/AppletCommonController.java create mode 100644 src/main/java/com/soft/line/controller/AppletContractController.java create mode 100644 src/main/java/com/soft/line/mapper/AppletCertificateMapper.java create mode 100644 src/main/java/com/soft/line/mapper/AppletCertificateMapper.xml create mode 100644 src/main/java/com/soft/line/mapper/AppletCommonMapper.java create mode 100644 src/main/java/com/soft/line/mapper/AppletCommonMapper.xml create mode 100644 src/main/java/com/soft/line/mapper/AppletContractMapper.java create mode 100644 src/main/java/com/soft/line/mapper/AppletContractMapper.xml create mode 100644 src/main/java/com/soft/line/service/AppletCertificateService.java create mode 100644 src/main/java/com/soft/line/service/AppletCommonService.java create mode 100644 src/main/java/com/soft/line/service/AppletContractService.java create mode 100644 src/main/java/com/soft/line/service/impl/AppletCertificateServiceImpl.java create mode 100644 src/main/java/com/soft/line/service/impl/AppletCommonServiceImpl.java create mode 100644 src/main/java/com/soft/line/service/impl/AppletContractServiceImpl.java diff --git a/src/main/java/com/soft/line/common/AppletSystemConstant.java b/src/main/java/com/soft/line/common/AppletSystemConstant.java new file mode 100644 index 0000000..8b9d858 --- /dev/null +++ b/src/main/java/com/soft/line/common/AppletSystemConstant.java @@ -0,0 +1,146 @@ +package com.soft.line.common; + +/** + * 小程序 常量 + * + * @author wpb + * @version 1.0 + * @date 2020/6/3 11:35 + */ +public class AppletSystemConstant { + + /* 基础数据 */ + + /** + * 部门对应 code_type + */ + public static final String CODE_TYPE_DEPT = "1"; + + /** + * 证书对应 code_type + */ + public static final String CODE_TYPE_CERT = "3"; + + /* 合同 部分通用 */ + + /** + * id + */ + public static final String ID = "id"; + + + /** + * 部门 + * depId + */ + public static final String DEP_ID = "depId"; + + /** + * 合同名称 + * contract_name + */ + public static final String CONTRACT_NAME = "contractName"; + + /** + * 项目id + * pro_id + */ + public static final String PRO_ID = "proId"; + + /** + * 总金额 + * total_amount + */ + public static final String TOTAL_AMOUNT = "totalAmount"; + + /** + * 第一签约方 + * part_a + */ + public static final String PART_A = "partA"; + + /** + * 第一签约方 + * part_b + */ + public static final String PART_B = "partB"; + + /** + * 签约时间 + * sign_time + */ + public static final String SIGN_TIME = "signTime"; + + /** + * 签约地点 + * sign_addr + */ + public static final String SIGN_ADDR = "signAddr"; + + /** + * 付款方式 + * payment + */ + public static final String PAYMENT = "payment"; + + /** + * 起始时间 + * begin_date + */ + public static final String BEGIN_DATE = "beginDate"; + + /** + * 终止时间 + * end_date + */ + public static final String END_DATE = "endDate"; + + /** + * 备注 + * note + */ + public static final String NOTE = "note"; + + /** + * 修改人 + * modify_person + */ + public static final String MODIFY_PERSON = "modifyPerson"; + + + /** + * 第几页 + * pageNum + */ + public static final String PAGE_NUM = "pageNum"; + + /** + * 每页数量 + * dataNum + */ + public static final String DATA_NUM = "dataNum"; + + /* 证书 部分通用 */ + + /** + * 证书比编号 + */ + public static final String CERT_ID = "certId"; + + /** + * 证书类型 + */ + public static final String CERT_TYPE = "certType"; + + /** + * 默认2004年 - 按照年份归档使用，显示最早年份 + * assignYear + */ + public static final int ASSIGN_YEAR = 2004; + + /** + * 初始值 + * num = 0 + */ + public static final int NUM = 0; +} diff --git a/src/main/java/com/soft/line/common/GlobalExceptionHandler.java b/src/main/java/com/soft/line/common/GlobalExceptionHandler.java new file mode 100644 index 0000000..9428f1a --- /dev/null +++ b/src/main/java/com/soft/line/common/GlobalExceptionHandler.java @@ -0,0 +1,74 @@ +package com.soft.line.common; + +import com.soft.line.util.exception.CommonResult; +import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.BindException; +import org.springframework.validation.FieldError; +import org.springframework.web.HttpRequestMethodNotSupportedException; +import org.springframework.web.bind.MethodArgumentNotValidException; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.RestControllerAdvice; + +import java.util.stream.Collectors; + +/** + * @Description: 全局异常处理器 异常在此处拦截进行处理 不用再在dao service controller中处理 + * + * @version: v1.0.0 + * @author: wpb + * @date: 2020年3月6日 下午1:13:00 + */ +@Slf4j +@RestControllerAdvice +public class GlobalExceptionHandler { + + /** + * 请求方式不支持 + */ + @ExceptionHandler({ HttpRequestMethodNotSupportedException.class }) + public CommonResult handleException(HttpRequestMethodNotSupportedException e) { + log.error(e.getMessage(), e); + return CommonResult.failed("不支持' " + e.getMethod() + "'请求"); + } + + /** + * 拦截未知的运行时异常 + */ + @ExceptionHandler(RuntimeException.class) + public CommonResult notFount(RuntimeException e) { + log.error("运行时异常:", e); + return CommonResult.failed("服务器异常，请联系管理员"); + } + + /** + * 参数校验异常 + */ + @ExceptionHandler({ MethodArgumentNotValidException.class }) + public CommonResult handleParamsException(MethodArgumentNotValidException e) { + String errorMsg = e.getBindingResult().getAllErrors().stream() + .map(objectError -> ((FieldError) objectError).getDefaultMessage()).collect(Collectors.joining(",")); + log.error(errorMsg, e); + return CommonResult.failed(errorMsg); + } + + /** + * formdata参数校验异常 + */ + @ExceptionHandler({ BindException.class }) + public CommonResult handleFromParamsException(BindException e) { + String errorMsg = e.getBindingResult().getAllErrors().stream() + .map(objectError -> ((FieldError) objectError).getDefaultMessage()).collect(Collectors.joining(",")); + log.error(errorMsg, e); + return CommonResult.failed(errorMsg); + } + + /** + * 系统异常 + */ + @ExceptionHandler(Exception.class) + public CommonResult handleException(Exception e) { + log.error(e.getMessage(), e); + return CommonResult.failed("服务器错误，请联系管理员"); + } + +} diff --git a/src/main/java/com/soft/line/common/WebMvcConfig.java b/src/main/java/com/soft/line/common/WebMvcConfig.java new file mode 100644 index 0000000..d018b5f --- /dev/null +++ b/src/main/java/com/soft/line/common/WebMvcConfig.java @@ -0,0 +1,27 @@ +package com.soft.line.common; + +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; + +/** + * @Description: 自定义静态资源映射配置（访问上传的文件） + * @version: v1.0.0 + * @author: wpb + * @date: 2020年3月30日 下午5:09:03 + */ +@Configuration +public class WebMvcConfig implements WebMvcConfigurer { + + @Value("${uploadFileDir}") + private String uploadFileDir; + + @Value("${uploadFileMapping}") + private String uploadFileMappingUrl; + + @Override + public void addResourceHandlers(ResourceHandlerRegistry registry) { + registry.addResourceHandler("/" + uploadFileMappingUrl + "**").addResourceLocations("file:///" + uploadFileDir); + } +} diff --git a/src/main/java/com/soft/line/controller/AppletCertificateController.java b/src/main/java/com/soft/line/controller/AppletCertificateController.java new file mode 100644 index 0000000..f07c83c --- /dev/null +++ b/src/main/java/com/soft/line/controller/AppletCertificateController.java @@ -0,0 +1,169 @@ +package com.soft.line.controller; + +import com.soft.line.common.AppletSystemConstant; +import com.soft.line.entity.CertificateInfo; +import com.soft.line.service.AppletCertificateService; +import com.soft.line.util.exception.CommonResult; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.StringUtils; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +/** + * 小程序证书 + * + * @author wpb + * @version 1.0 + * @date 2020/6/3 15:13 + */ +@RestController +@RequestMapping("/applet") +public class AppletCertificateController { + + @Autowired + private AppletCertificateService appletCertificateService; + + /** + * 小程序接口使用 + * 获取每个部门的证书总数 + * + * @return + */ + @PostMapping("/getCertificateNum") + public CommonResult> getCertificateNum() { + return appletCertificateService.getCertificateNum(); + } + + /** + * 根据证书类型获取证书年列表数据 + * + * @param paramMap 参数 + * @return + */ + @PostMapping("/getCertificateYearList") + public CommonResult>> getCertificateYearList(@RequestBody Map paramMap) { + if (!StringUtils.hasText(paramMap.get(AppletSystemConstant.CERT_TYPE).toString())) { + return CommonResult.failed("证书类型不为空"); + } + return appletCertificateService.getCertificateYearList(paramMap); + } + + /** + * 根据证书类型cert_type和起始日期年份以及当前页、每页显示条数分页查询证书年列表 + * + * @param paramMap 参数 + * @return + */ + @PostMapping("/getCertificateList") + public CommonResult> getCertificateList(@RequestBody Map paramMap) { + if (!StringUtils.hasText(paramMap.get(AppletSystemConstant.CERT_TYPE).toString())) { + return CommonResult.failed("证书类型不为空"); + } + if (!StringUtils.hasText(paramMap.get(AppletSystemConstant.BEGIN_DATE).toString())) { + return CommonResult.failed("选择的年不存在"); + } + if (!StringUtils.hasText(String.valueOf(paramMap.get(AppletSystemConstant.PAGE_NUM)))) { + return CommonResult.failed("第几页不能为空"); + } + if (!StringUtils.hasText(String.valueOf(paramMap.get(AppletSystemConstant.DATA_NUM)))) { + return CommonResult.failed("条数不能为空"); + } + return appletCertificateService.getCertificateList(paramMap); + } + + /** + * 小程序使用 + * 根据证书id查询证书信息 + * + * @param paramMap 参数 + * @return + */ + @PostMapping("/getCertificate") + public CommonResult> getCertificate(@RequestBody Map paramMap) { + if(paramMap.get(AppletSystemConstant.ID) == null){ + return CommonResult.failed("请选择证书"); + } + return appletCertificateService.getCertificate(paramMap); + } + + /** + * 小程序使用 + * 修改证书信息 + * + * @param paramMap 参数 + * @return + */ + @PostMapping("/updateCertificate") + public CommonResult updateCertificate(@RequestBody Map paramMap) { + if(!StringUtils.hasText(paramMap.get(AppletSystemConstant.CERT_ID).toString())){ + return CommonResult.failed("证书编号不存在"); + } + if(!StringUtils.hasText(paramMap.get(AppletSystemConstant.ID).toString())){ + return CommonResult.failed("证书唯一码不存在"); + } + return appletCertificateService.updateCertificate(paramMap); + } + + /** + * 小程序使用 + * 删除证书 + * + * @param paramMap + * @return + */ + @PostMapping("/deleteCertificate") + public CommonResult deleteCertificate(@RequestBody Map paramMap) { + if(!StringUtils.hasText(paramMap.get(AppletSystemConstant.ID).toString())){ + return CommonResult.failed("证书唯一码不存在"); + } + return appletCertificateService.deleteCertificate(paramMap); + } + + /** + * 小程序使用 + * 根据证书名称分页模糊查询证书列表 + * + * @param paramMap + * @return + */ + @PostMapping("/getCertificateSearchList") + public CommonResult> getCertificateSearchList(@RequestBody Map paramMap) { + if (!StringUtils.hasText(String.valueOf(paramMap.get(AppletSystemConstant.PAGE_NUM)))) { + return CommonResult.failed("第几页不能为空"); + } + if (!StringUtils.hasText(String.valueOf(paramMap.get(AppletSystemConstant.DATA_NUM)))) { + return CommonResult.failed("条数不能为空"); + } + return appletCertificateService.getCertificateSearchList(paramMap); + } + + /** + * 小程序使用 + * 新增证书 + * + * @param certificateInfo 参数 + * @return + */ + @PostMapping("/addCertificate") + public CommonResult> addCertificate(@RequestBody CertificateInfo certificateInfo) { + return appletCertificateService.addCertificate(certificateInfo); + } + + /** + * 小程序使用 + * 根据证书详情信息分页查询证书列表 + * + * @param paramMap 参数 + * @return + */ + @PostMapping("/getCertificateQueryList") + public CommonResult> getCertificateQueryList(@RequestBody Map paramMap) { + return appletCertificateService.getCertificateQueryList(paramMap); + } + +} diff --git a/src/main/java/com/soft/line/controller/AppletCommonController.java b/src/main/java/com/soft/line/controller/AppletCommonController.java new file mode 100644 index 0000000..5ddbe6d --- /dev/null +++ b/src/main/java/com/soft/line/controller/AppletCommonController.java @@ -0,0 +1,105 @@ +package com.soft.line.controller; + +import com.soft.line.service.AppletCommonService; +import com.soft.line.util.exception.CommonResult; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.StringUtils; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.multipart.MultipartFile; + +import javax.annotation.Resource; +import java.util.List; +import java.util.Map; + +/** + * 小程序接口 + * 公用 —— 枚举数据，文件上传 + * + * @author wpb + * @version 1.0 + * @date 2020/6/1 9:06 + */ +@RestController +@RequestMapping("/applet") +public class AppletCommonController { + + + @Autowired + private AppletCommonService appletCommonService; + + /** + * 小程序使用 + * 获取到所有的枚举数据。 + * + * @return + */ + @PostMapping("/getBaseData") + public CommonResult>>> getBaseData() { + return appletCommonService.getBaseData(); + } + + /** + * 小程序使用 + * 合同file上传 + * + * @param file 文件 + * @param id id + * @param fileName 文件名 + * @param modifyPerson 修改人 + * @return + */ + @PostMapping("/uploadContractAttach") + public CommonResult uploadContractAttach(@RequestParam("file") MultipartFile file, + @RequestParam("id") Integer id, @RequestParam("fileName") String fileName, @RequestParam("modifyPerson") String modifyPerson) { + + if (!StringUtils.hasText(fileName)) { + return CommonResult.failed("请填写合同名称"); + } + + if (id == null) { + return CommonResult.failed("请选择部门"); + } + + if (file.isEmpty()) { + return CommonResult.failed("请选择要上传的文件！！！"); + } + + return appletCommonService.uploadContractAttach(file, id, fileName, modifyPerson); + + } + + /** + * 小程序使用 + * 证书 file上传 + * + * @param file 文件 + * @param id id + * @param fileName 文件名 + * @param modifyPerson 修改人 + * @return + */ + @PostMapping("/uploadCertificateAttach") + public CommonResult uploadCertificateAttach(@RequestParam("file") MultipartFile file, + @RequestParam("id") Integer id, @RequestParam("fileName") String fileName, @RequestParam("modifyPerson") String modifyPerson) { + + if (!StringUtils.hasText(fileName)) { + return CommonResult.failed("证书名称不存在"); + } + + if (id == null) { + return CommonResult.failed("请选择部门"); + } + + if (file.isEmpty()) { + return CommonResult.failed("请选择要上传的文件！！！"); + } + + return appletCommonService.uploadCertificateAttach(file, id, fileName, modifyPerson); + + } + + +} diff --git a/src/main/java/com/soft/line/controller/AppletContractController.java b/src/main/java/com/soft/line/controller/AppletContractController.java new file mode 100644 index 0000000..6bc13e7 --- /dev/null +++ b/src/main/java/com/soft/line/controller/AppletContractController.java @@ -0,0 +1,169 @@ +package com.soft.line.controller; + +import com.soft.line.common.AppletSystemConstant; +import com.soft.line.entity.ContractInfo; +import com.soft.line.service.AppletContractService; +import com.soft.line.util.exception.CommonResult; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.StringUtils; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.Map; + +/** + * 小程序合同控制 + * + * @author wpb + * @version 1.0 + * @date 2020/5/26 13:32 + */ +@RestController +@RequestMapping("/applet") +public class AppletContractController { + + @Autowired + private AppletContractService appletContractService; + + /** + * 小程序使用 + * 查询每个部门的合同总数 + * + * @return + */ + @PostMapping("/getContractNum") + public CommonResult> getContractNum() { + return appletContractService.getContractNum(); + } + + /** + * 小程序使用 + * 根据部门id获取合同年列表数据 + * + * @param paraMap 参数 + * @return + */ + @PostMapping("/getContractYearList") + public CommonResult>> getContractYearList(@RequestBody Map paraMap) { + if (!StringUtils.hasText(String.valueOf(paraMap.get(AppletSystemConstant.DEP_ID)))) { + return CommonResult.failed("部门不能为空"); + } + return appletContractService.getContractYearList(paraMap); + } + + /** + * 小程序接口 + * 根据部门id和签订年份分页查询合同列表 + * + * @param paraMap 参数 + * @return + */ + @PostMapping("/getContractList") + public CommonResult> getContractList(@RequestBody Map paraMap) { + if (!StringUtils.hasText(String.valueOf(paraMap.get(AppletSystemConstant.DEP_ID)))) { + return CommonResult.failed("部门不能为空"); + } + if (!StringUtils.hasText(String.valueOf(paraMap.get(AppletSystemConstant.SIGN_TIME)))) { + return CommonResult.failed("年限不能为空"); + } + if (!StringUtils.hasText(String.valueOf(paraMap.get(AppletSystemConstant.PAGE_NUM)))) { + return CommonResult.failed("第几页不能为空"); + } + if (!StringUtils.hasText(String.valueOf(paraMap.get(AppletSystemConstant.DATA_NUM)))) { + return CommonResult.failed("条数不能为空"); + } + return appletContractService.getContractList(paraMap); + } + + /** + * 小程序使用接口 + * 根据合同名称分页模糊查询合同列表 + * + * @param paraMap 参数 + * @return + */ + @PostMapping("/getContractSearchList") + public CommonResult> getContractSearchList(@RequestBody Map paraMap) { + if (!StringUtils.hasText(String.valueOf(paraMap.get(AppletSystemConstant.CONTRACT_NAME)))) { + return CommonResult.failed("合同名称不能为空"); + } + if (!StringUtils.hasText(String.valueOf(paraMap.get(AppletSystemConstant.PAGE_NUM)))) { + return CommonResult.failed("第几页不能为空"); + } + if (!StringUtils.hasText(String.valueOf(paraMap.get(AppletSystemConstant.DATA_NUM)))) { + return CommonResult.failed("条数不能为空"); + } + return appletContractService.getContractSearchList(paraMap); + } + + /** + * 根据合同详情信息分页查询合同列表 + * + * @param paraMap 参数 + * @return + */ + @PostMapping("/getContractQueryList") + public CommonResult> getContractQueryList(@RequestBody Map paraMap) { + if (!StringUtils.hasText(String.valueOf(paraMap.get(AppletSystemConstant.PAGE_NUM)))) { + return CommonResult.failed("第几页不能为空"); + } + if (!StringUtils.hasText(String.valueOf(paraMap.get(AppletSystemConstant.DATA_NUM)))) { + return CommonResult.failed("条数不能为空"); + } + return appletContractService.getContractQueryList(paraMap); + } + + /** + * 小程序使用接口 + * 新增合同 + * + * @param contractInfo 参数 + * @return + */ + @PostMapping("/addContract") + public CommonResult> addContract(@RequestBody ContractInfo contractInfo) { + return appletContractService.addContract(contractInfo); + } + + /** + * 小程序使用 + * 修改合同信息 + * + * @param paraMap 参数 + * @return + */ + @PostMapping("/updateContract") + public CommonResult updateContract(@RequestBody Map paraMap) { + if(paraMap.get(AppletSystemConstant.ID) == null){ + return CommonResult.failed(); + } + + return appletContractService.updateContract(paraMap); + } + + /** + * 根据合同id查询合同详情信息 + * + * @param paraMap 参数 + * @return + */ + @PostMapping("/getContract") + public CommonResult> getContract(@RequestBody Map paraMap) { + return appletContractService.getContract(paraMap); + } + + /** + * 小程序使用 + * 根据id删除合同信息 + * + * @param paraMap 参数 + * @return + */ + @PostMapping("/deleteContract") + public CommonResult deleteContract(@RequestBody Map paraMap) { + return appletContractService.deleteContract(paraMap); + } + + +} diff --git a/src/main/java/com/soft/line/mapper/AppletCertificateMapper.java b/src/main/java/com/soft/line/mapper/AppletCertificateMapper.java new file mode 100644 index 0000000..10723fc --- /dev/null +++ b/src/main/java/com/soft/line/mapper/AppletCertificateMapper.java @@ -0,0 +1,130 @@ +package com.soft.line.mapper; + +import com.soft.line.entity.CertificateInfo; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Map; + +/** + * 小程序 证书 + * + * @author wpb + * @version 1.0 + * @date 2020/6/3 15:46 + */ +public interface AppletCertificateMapper { + + /** + * 获取每个部门的证书总数 + * + * @return + */ + List> getCertificateNum(); + + /** + * 根据证书类型获取证书年列表数据 + * + * @param certType 参数 + * @return + */ + List> getCertificateYearList(@Param(value = "certType") String certType); + + /** + * 根据证书类型cert_type和起始日期年份以及当前页、每页显示条数分页查询证书年列表 + * + * @param paramMap 参数 + * @return + */ + List> getCertificateList(Map paramMap); + + /** + * 根据证书类型cert_type和起始日期年份以及当前页、每页显示条数分页查询证书年列表 + * 符合条件的 总数 + * + * @param paramMap 参数 + * @return + */ + int countCertificateList(Map paramMap); + + /** + * 根据id查询详情 + * + * @param paramMap 参数 + * @return + */ + Map getCertificate(Map paramMap); + + /** + * 修改证书 + * + * @param paramMap 参数 + * @return + */ + int updateCertificate(Map paramMap); + + /** + * 根据证书编号和！id，校验证书编号是否重复 + * + * @param certId 证书编号 + * @param id id + * @return + */ + int checkCertificateByCertIdAndId(String certId, int id); + + /** + * 删除证书 + * + * @param paramMap 参数 + * @return + */ + int deleteCertificate(Map paramMap); + + /** + * 根据证书名称分页模糊查询证书列表 + * + * @param paramMap 参数 + * @return + */ + List> getCertificateSearchList(Map paramMap); + + /** + * 根据证书名称模糊查询证书列表总数 + * + * @param paramMap 参数 + * @return + */ + int countGetCertificateSearchList(Map paramMap); + + /** + * 新增证书 + * + * @param certificateInfo 参数 + * @return + */ + int addCertificate(CertificateInfo certificateInfo); + + /** + * 校验 证书编号是否存在 + * + * @param certId 证书编号 + * @return + */ + int checkCertificateByCertId(@Param(value = "certId") String certId); + + /** + * 根据证书详情信息分页查询证书列表 + * + * @param paramMap 参数 + * @return + */ + List> getContractQueryList(Map paramMap); + + /** + * 根据证书详情信息查询证书列表 求和 + * + * @param paramMap 参数 + * @return + */ + int countGetContractQueryList(Map paramMap); +} diff --git a/src/main/java/com/soft/line/mapper/AppletCertificateMapper.xml b/src/main/java/com/soft/line/mapper/AppletCertificateMapper.xml new file mode 100644 index 0000000..4350995 --- /dev/null +++ b/src/main/java/com/soft/line/mapper/AppletCertificateMapper.xml @@ -0,0 +1,243 @@ + + + + + + + + + + + + + + + + UPDATE certificate_info + SET cert_id = #{certId}, + cert_type = #{certType}, + cert_name = #{certName}, + project_name = #{projectName}, + cert_unit = #{certUnit}, + begin_date = #{beginDate}, + end_date = #{endDate}, + note = #{note}, + modify_person = #{modifyPerson}, + modify_time = NOW() + WHERE + id = #{id} + + + + + + update certificate_info + set modify_person = #{modifyPerson}, + modify_time = #{modifyTime}, + del_flg = #{delFlg} + where id = #{id} + + + + + + + + INSERT INTO certificate_info ( + cert_id, + cert_type, + cert_name, + project_name, + cert_unit, + begin_date, + end_date, + note, + modify_person, + modify_time, + del_flg + ) + VALUES + ( + #{certId}, + #{certType}, + #{certName}, + #{projectName}, + #{certUnit}, + #{beginDate}, + #{endDate}, + #{note}, + #{modifyPerson}, + NOW(), + 0 + ) + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/AppletCommonMapper.java b/src/main/java/com/soft/line/mapper/AppletCommonMapper.java new file mode 100644 index 0000000..13d23d4 --- /dev/null +++ b/src/main/java/com/soft/line/mapper/AppletCommonMapper.java @@ -0,0 +1,72 @@ +package com.soft.line.mapper; + +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.Date; +import java.util.List; +import java.util.Map; + +/** + * 小程序公用 + * + * @author wpb + * @version 1.0 + * @date 2020/6/1 9:16 + */ +public interface AppletCommonMapper { + /** + * 枚举数据 + * + * @return + */ + List> codeDetailMap(); + + /** + * 根据 (类型)code_type 查询 (代码序号)code_detail + * @param codeType 部门类型 + * @return + */ + List codeDetailList(String codeType); + + /** + * 添加附件 + * + * @param attachmentName 名称 + * @param attachmentUrl 地址 + * @param modifyPerson 添加人 + * @param modifyTime 时间 + * @param type 类型 + * @param cId 对应的id + * @return + */ + int addAnnex(@Param(value = "attachmentName") String attachmentName, @Param(value = "attachmentUrl") String attachmentUrl, + @Param(value = "modifyPerson") String modifyPerson, @Param(value = "modifyTime") Date modifyTime, + @Param(value = "type") String type, @Param(value = "cId") int cId); + + /** + * 根据 cid 和 类型 查询 附件 + * + * @param cId + * @param type + * @return + */ + List> getAnnexes(@Param(value = "cId") int cId, @Param(value = "type") String type); + + /** + * 根据id删除附件 + * + * @param id + * @return + */ + int delAnnex(int id); + + /** + * 批量删除 + * + * @param ids + */ + void delAnnexList(List ids); + + +} diff --git a/src/main/java/com/soft/line/mapper/AppletCommonMapper.xml b/src/main/java/com/soft/line/mapper/AppletCommonMapper.xml new file mode 100644 index 0000000..3dbf951 --- /dev/null +++ b/src/main/java/com/soft/line/mapper/AppletCommonMapper.xml @@ -0,0 +1,44 @@ + + + + + + + + + + insert into attachment_info( + attachment_name,attachment_url,modify_person,modify_time,type,c_id + )value ( + #{attachmentName},#{attachmentUrl},#{modifyPerson},#{modifyTime},#{type},#{cId} + ) + + + + + + delete from attachment_info where id = #{id} + + + + delete from attachment_info where id in + + #{id} + + + + \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/AppletContractMapper.java b/src/main/java/com/soft/line/mapper/AppletContractMapper.java new file mode 100644 index 0000000..0933f99 --- /dev/null +++ b/src/main/java/com/soft/line/mapper/AppletContractMapper.java @@ -0,0 +1,132 @@ +package com.soft.line.mapper; + +import com.soft.line.entity.ContractInfo; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Map; + +/** + * 小程序合同mapper + * + * @author wpb + * @version 1.0 + * @date 2020/5/26 15:49 + */ +public interface AppletContractMapper { + + /** + * 查询每个部门的合同总数 + * + * @return + */ + List> contractNum(); + + + /** + * 根据部门id获取合同年列表数据 + * + * @param paraMap + * @return + */ + List> getContractYearList(Map paraMap); + + /** + * 根据部门id和签订年份分页查询合同列表 + * + * @param paraMap + * @return + */ + List> getContractList(Map paraMap); + + /** + * 合同根据id和所在年计数 + * @param depId + * @param signTime + * @return + */ + int countContractList(@Param(value = "depId") String depId,@Param(value = "signTime") String signTime); + + + /** + * 根据合同名称分页模糊查询合同列表 + * + * @param paraMap + * @return + */ + List> getContractSearchList(Map paraMap); + + /** + * 根据 合同名称模糊查询 个数 + * @param contractName + * @return + */ + int countContractSearchList(String contractName); + + + /** + * 根据合同详情信息分页查询合同列表 + * + * @param paraMap + * @return + */ + List> getContractQueryList(Map paraMap); + + /** + * 根据 合同信息 模糊查询 + * @param paraMap + * @return + */ + int countContractQueryList(Map paraMap); + + /** + * 添加合同 + * + * @param contractInfo + * @return + */ + int addContract(ContractInfo contractInfo); + + /** + * 修改合同 + * + * @param paraMap + * @return + */ + int updateContract(Map paraMap); + + /** + * 通过id，查询部门详情 + * + * @param paraMap + * @return + */ + Map getContract(Map paraMap); + + /** + * 根据id删除合同 + * + * @param paraMap + * @return + */ + int deleteContract(Map paraMap); + + /** + * 根据合同名称，校验合同是否存在 + * + * @param contractName + * @return + */ + int checkContractByName(String contractName); + + /** + * 根据合同名称 and id 判断合同 是否 存在 + * + * @param contractName + * @param id + * @return + */ + int checkContractByNameAndId(@Param(value = "contractName") String contractName, @Param(value = "id") int id); + + +} diff --git a/src/main/java/com/soft/line/mapper/AppletContractMapper.xml b/src/main/java/com/soft/line/mapper/AppletContractMapper.xml new file mode 100644 index 0000000..43a3fb1 --- /dev/null +++ b/src/main/java/com/soft/line/mapper/AppletContractMapper.xml @@ -0,0 +1,203 @@ + + + + + + + + + + + + + + + + + + + + + + insert into `contract_info` (`dep_id`, `contract_name`, `pro_id`, + `total_amount`, `part_a`, `part_b`, + `sign_time`, `sign_addr`, `begin_date`, + `end_date`, `payment`, `note`, + `modify_person`, `modify_time`, `del_flg` + ) + values (#{depId,jdbcType=VARCHAR}, #{contractName,jdbcType=VARCHAR}, #{proId,jdbcType=VARCHAR}, + #{totalAmount,jdbcType=DECIMAL}, #{partA,jdbcType=VARCHAR}, #{partB,jdbcType=VARCHAR}, + #{signTime,jdbcType=TIMESTAMP}, #{signAddr,jdbcType=VARCHAR}, #{beginDate,jdbcType=TIMESTAMP}, + #{endDate,jdbcType=TIMESTAMP}, #{payment,jdbcType=VARCHAR}, #{note,jdbcType=VARCHAR}, + #{modifyPerson,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}, #{delFlg,jdbcType=CHAR} + ) + + + + + UPDATE contract_info set + dep_id = #{depId} , + contract_name = #{contractName} , + pro_id = #{proId} , + total_amount = #{totalAmount} , + part_a = #{partA} , + part_b = #{partB} , + sign_time = #{signTime} , + sign_addr = #{signAddr} , + begin_date = #{beginDate} , + end_date = #{endDate} , + payment = #{payment} , + note = #{note} , + modify_person = #{modifyPerson} , + modify_time = #{modifyTime} + where id = #{id} + + + + + + update contract_info set modify_person = #{modifyPerson} , del_flg = #{delFlg} , modify_time = #{modifyTime} where id = #{id} + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/soft/line/service/AppletCertificateService.java b/src/main/java/com/soft/line/service/AppletCertificateService.java new file mode 100644 index 0000000..267ff33 --- /dev/null +++ b/src/main/java/com/soft/line/service/AppletCertificateService.java @@ -0,0 +1,81 @@ +package com.soft.line.service; + +import com.soft.line.entity.CertificateInfo; +import com.soft.line.util.exception.CommonResult; + +import java.util.List; +import java.util.Map; + +/** + * 小程序 证书 + * + * @author wpb + * @version 1.0 + * @date 2020/6/3 15:44 + */ +public interface AppletCertificateService { + + /** + * 获取每个部门的证书总数 + * + * @return + */ + CommonResult> getCertificateNum(); + + /** + * 根据证书类型获取证书年列表数据 + * + * @param paramMap 参数 + * @return + */ + CommonResult>> getCertificateYearList(Map paramMap); + + /** + * 根据证书类型cert_type和起始日期年份以及当前页、每页显示条数分页查询证书年列表 + * @param paramMap 参数 + * @return + */ + CommonResult> getCertificateList(Map paramMap); + + /** + * 根据证书id查询证书信息 + * @param paramMap 参数 + * @return + */ + CommonResult> getCertificate(Map paramMap); + + /** + * 修改证书 + * @param paramMap + * @return + */ + CommonResult updateCertificate(Map paramMap); + + /** + * 删除证书 + * @param paramMap 参数 + * @return + */ + CommonResult deleteCertificate(Map paramMap); + + /** + * 根据证书名称分页模糊查询证书列表 + * @param paramMap 参数 + * @return + */ + CommonResult> getCertificateSearchList(Map paramMap); + + /** + * 添加证书 + * @param certificateInfo 参数 + * @return + */ + CommonResult> addCertificate(CertificateInfo certificateInfo); + + /** + * 根据证书详情信息分页查询证书列表 + * @param paramMap 参数 + * @return + */ + CommonResult> getCertificateQueryList(Map paramMap); +} diff --git a/src/main/java/com/soft/line/service/AppletCommonService.java b/src/main/java/com/soft/line/service/AppletCommonService.java new file mode 100644 index 0000000..7226aff --- /dev/null +++ b/src/main/java/com/soft/line/service/AppletCommonService.java @@ -0,0 +1,47 @@ +package com.soft.line.service; + +import com.soft.line.util.exception.CommonResult; +import org.springframework.web.multipart.MultipartFile; + +import java.util.List; +import java.util.Map; + +/** + * 小程序 公用 + * + * @author wpb + * @version 1.0 + * @date 2020/6/1 9:07 + */ +public interface AppletCommonService { + /** + * 获取到所有的枚举数据 + * + * @return + */ + CommonResult>>> getBaseData(); + + /** + * 合同上传 + * + * @param file 文件 + * @param id id + * @param fileName 文件名称 + * @param modifyPerson 修改人 + * @return + */ + CommonResult uploadContractAttach(MultipartFile file, int id, String fileName, String modifyPerson); + + /** + * 证书 file上传 + * + * @param file 文件 + * @param id id + * @param fileName 文件名称 + * @param modifyPerson 修改人 + * @return + */ + CommonResult uploadCertificateAttach(MultipartFile file, int id, String fileName, String modifyPerson); + + +} diff --git a/src/main/java/com/soft/line/service/AppletContractService.java b/src/main/java/com/soft/line/service/AppletContractService.java new file mode 100644 index 0000000..4a7b8c4 --- /dev/null +++ b/src/main/java/com/soft/line/service/AppletContractService.java @@ -0,0 +1,92 @@ +package com.soft.line.service; + +import com.soft.line.entity.ContractInfo; +import com.soft.line.util.exception.CommonResult; +import org.springframework.web.multipart.MultipartFile; + +import java.util.List; +import java.util.Map; + +/** + * 小程序合同service + * + * @author wpb + * @version 1.0 + * @date 2020/5/26 15:46 + */ +public interface AppletContractService { + + /** + * 获取每个部门的合同总数， + * 注意：若某个部门下合同数为空，也需要返回此部门id的key， + * + * @return + */ + CommonResult> getContractNum(); + + /** + * 根据部门id获取合同年列表数据 + * + * @param paraMap 部门编号 + * @return + */ + CommonResult>> getContractYearList(Map paraMap); + + /** + * 根据部门id和签订年份分页查询合同列表 + * + * @param paraMap 参数 + * @return + */ + CommonResult> getContractList(Map paraMap); + + /** + * 根据合同名称分页模糊查询合同列表 + * + * @param paraMap 参数 + * @return + */ + CommonResult> getContractSearchList(Map paraMap); + + /** + * 根据合同详情信息分页查询合同列表 + * + * @param paraMap 参数 + * @return + */ + CommonResult> getContractQueryList(Map paraMap); + + /** + * 添加合同 + * + * @param contractInfo 参数 + * @return + */ + CommonResult> addContract(ContractInfo contractInfo); + + /** + * 修改合同信息 + * + * @param paraMap 入参 + * @return + */ + CommonResult updateContract(Map paraMap); + + /** + * 根据合同id查询合同信息 + * + * @param paraMap 参数 + * @return + */ + CommonResult> getContract(Map paraMap); + + /** + * 删除合同信息 + * + * @param paraMap 参数 + * @return + */ + CommonResult deleteContract(Map paraMap); + + +} diff --git a/src/main/java/com/soft/line/service/impl/AppletCertificateServiceImpl.java b/src/main/java/com/soft/line/service/impl/AppletCertificateServiceImpl.java new file mode 100644 index 0000000..231a9dd --- /dev/null +++ b/src/main/java/com/soft/line/service/impl/AppletCertificateServiceImpl.java @@ -0,0 +1,299 @@ +package com.soft.line.service.impl; + +import com.soft.line.common.AppletSystemConstant; +import com.soft.line.entity.CertificateInfo; +import com.soft.line.mapper.AppletCertificateMapper; +import com.soft.line.mapper.AppletCommonMapper; +import com.soft.line.service.AppletCertificateService; +import com.soft.line.util.exception.CommonResult; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; + +import java.io.File; +import java.text.DateFormat; +import java.text.SimpleDateFormat; +import java.util.*; + +/** + * 小程序 证书 + * + * @author wpb + * @version 1.0 + * @date 2020/6/3 15:45 + */ +@Service +public class AppletCertificateServiceImpl implements AppletCertificateService { + + /** + * 虚拟 + */ + @Value("${uploadFileMapping}") + private String uploadFileMappingUrl; + + /** + * 文件上传路径 例如：D盘下的路径 + */ + @Value(value = "${uploadFileDir}") + private String uploadFileDir; + + @Autowired + private AppletCertificateMapper appletCertificateMapper; + + @Autowired + private AppletCommonMapper appletCommonMapper; + + @Override + public CommonResult> getCertificateNum() { + Map map = new HashMap<>(0); + List> mapList = appletCertificateMapper.getCertificateNum(); + //查询证书类型 + List certTypes = appletCommonMapper.codeDetailList(AppletSystemConstant.CODE_TYPE_CERT); + + if (certTypes.size() > 0) { + for (String certType : certTypes) { + map.put(certType, 0); + } + + for (Map mapData : mapList) { + for (String certType : certTypes) { + if (certType.equals(mapData.get("certType"))) { + map.put(certType, mapData.get("num")); + } + } + } + + } else { + return CommonResult.failed("查询证书类型出错"); + } + return CommonResult.success(map); + } + + @Override + public CommonResult>> getCertificateYearList(Map paramMap) { + List> list = new ArrayList<>(); + + //获取今年字符串 例：2020 + String year = getDate("yyyy", new Date()); + + for (int i = Integer.parseInt(year); i > AppletSystemConstant.ASSIGN_YEAR; i--) { + Map map = new HashMap<>(0); + map.put("beginDate", String.valueOf(i)); + map.put("num", AppletSystemConstant.NUM); + list.add(map); + } + + // beginDate = 0 ; 2005年以前 + Map map = new HashMap<>(0); + map.put("beginDate", AppletSystemConstant.NUM); + map.put("num", AppletSystemConstant.NUM); + list.add(map); + + List> mapList = appletCertificateMapper.getCertificateYearList(paramMap.get("certType").toString()); + + if (mapList.size() > 0) { + //2005 年之前的，不包含2005 + int num = 0; + int time = 2005; + for (Map mapYear : mapList) { + if (Integer.parseInt(mapYear.get("beginDate").toString()) < time) { + num += Integer.parseInt(mapYear.get("num").toString()); + } + + //数据处理 2005年 以后的 + for (Map mapLists : list) { + for (Map mapData : mapList) { + if (Integer.parseInt(mapLists.get("beginDate").toString()) != 0) { + if (mapLists.get("beginDate").equals(mapData.get("beginDate"))) { + mapLists.put("num", mapData.get("num")); + } + } else { + mapLists.put("num", num); + } + } + } + + } + } + + return CommonResult.success(list); + } + + @Override + public CommonResult> getCertificateList(Map paramMap) { + Map map = new HashMap<>(0); + + //从第几条开始 + int num = ((Integer.parseInt(paramMap.get("pageNum").toString())) - 1) * (Integer.parseInt(paramMap.get("dataNum").toString())); + paramMap.put("pageNum", num); + + List> mapList = appletCertificateMapper.getCertificateList(paramMap); + + //条件下的总个数 + int i = appletCertificateMapper.countCertificateList(paramMap); + + //总个数大于 + map.put("hasMore", i > (num + ((int) paramMap.get("dataNum")))); + map.put("certificateList", mapList); + + return CommonResult.success(map); + } + + @Override + public CommonResult> getCertificate(Map paramMap) { + //证书详情 + Map certificate = appletCertificateMapper.getCertificate(paramMap); + + if (certificate == null || certificate.isEmpty()) { + return CommonResult.failed("未查询出结果"); + } + + //附件详情 + List> attachmentList = appletCommonMapper.getAnnexes(Integer.parseInt(paramMap.get("id").toString()), "2"); + //拼接路径 + List> annexesList = new ArrayList<>(); + // 拼 路径 uploadFileMappingUrl + for (Map mapAnnex : attachmentList) { + mapAnnex.put("attachmentUrl", uploadFileMappingUrl + mapAnnex.get("attachmentUrl")); + annexesList.add(mapAnnex); + } + + certificate.put("attachmentList", annexesList); + + return CommonResult.success(certificate); + } + + @Override + public CommonResult updateCertificate(Map paramMap) { + if (appletCertificateMapper.checkCertificateByCertIdAndId((String) paramMap.get(AppletSystemConstant.CERT_ID), (int) paramMap.get(AppletSystemConstant.ID)) != 0) { + return CommonResult.failed("证书编号已存在"); + } + + if (appletCertificateMapper.updateCertificate(paramMap) != 1) { + return CommonResult.failed("修改证书失败"); + } + + //对附件的操作 告诉编译器忽略 unchecked 警告信息，如使用List，ArrayList等未进行参数化产生的警告信息。 + @SuppressWarnings("unchecked") + List> annexList = (List>) paramMap.get("deleteAttachmentList"); + + StringBuilder deleteErrorMsg = new StringBuilder(); + + if (annexList.size() > 0) { + + //执行删除 + for (Map map : annexList) { + //附件表 url + String attachmentUrl = (String) map.get("attachmentUrl"); + String fileUrl = attachmentUrl.substring(attachmentUrl.indexOf(uploadFileMappingUrl) + 12); + + //删除附件文件 + File fileDir = new File(uploadFileDir + fileUrl); + boolean deleteResult = fileDir.delete(); + + if (!deleteResult) { + //deleteErrorMsg += "，删除文件：" + attachmentUrl.substring(attachmentUrl.lastIndexOf("/")) + "失败"; + deleteErrorMsg.append("，删除文件：").append(attachmentUrl.substring(attachmentUrl.lastIndexOf("/"))).append("失败"); + } else { + appletCommonMapper.delAnnex((int) map.get("id")); + } + + } + } + + return CommonResult.success(null, "修改证书成功" + deleteErrorMsg); + } + + @Override + public CommonResult deleteCertificate(Map paramMap) { + //删除时间 + paramMap.put("modifyTime", new Date()); + //删除状态 + paramMap.put("delFlg", "1"); + if (appletCertificateMapper.deleteCertificate(paramMap) != 1) { + return CommonResult.failed("删除合同失败"); + } else { + //附件信息 + List> oldAttachments = appletCommonMapper.getAnnexes((int) paramMap.get("id"), "2"); + + //删除附件 + for (Map map : oldAttachments) { + //附件表 url + String attachmentUrl = (String) map.get("attachmentUrl"); + + //删除附件文件 + File fileDir = new File(uploadFileDir + attachmentUrl); + + boolean deleteResult = fileDir.delete(); + + //删除附件基本信息 + if (deleteResult) { + appletCommonMapper.delAnnex((int) map.get("id")); + } + } + + return CommonResult.success("删除合同成功"); + } + } + + @Override + public CommonResult> getCertificateSearchList(Map paramMap) { + Map map = new HashMap<>(0); + + //从第几条开始 + int num = ((int) paramMap.get("pageNum") - 1) * ((int) paramMap.get("dataNum")); + paramMap.put("pageNum", num); + + List> mapList = appletCertificateMapper.getCertificateSearchList(paramMap); + + map.put("certificateList",mapList); + //条件下的总个数 + map.put("hasMore",appletCertificateMapper.countGetCertificateSearchList(paramMap) > (num+(int) paramMap.get(AppletSystemConstant.DATA_NUM)) ); + + return CommonResult.success(map); + } + + @Override + public CommonResult> addCertificate(CertificateInfo certificateInfo) { + + if (appletCertificateMapper.checkCertificateByCertId(certificateInfo.getCertId()) != 0) { + return CommonResult.failed("证书编号已存在"); + } + + if(appletCertificateMapper.addCertificate(certificateInfo) == 1){ + Map map = new HashMap<>(0); + map.put("id",certificateInfo.getId()); + return CommonResult.success(map); + } + return CommonResult.failed("添加证书失败"); + } + + @Override + public CommonResult> getCertificateQueryList(Map paramMap) { + Map map = new HashMap<>(0); + + //从第几条开始 + int num = ((int) paramMap.get("pageNum") - 1) * ((int) paramMap.get("dataNum")); + paramMap.put("pageNum", num); + + List> mapList = appletCertificateMapper.getContractQueryList(paramMap); + + map.put("certificateList",mapList); + map.put("hasMore",appletCertificateMapper.countGetContractQueryList(paramMap) > (num+(int) paramMap.get(AppletSystemConstant.DATA_NUM)) ); + + return CommonResult.success(map); + } + + /** + * 自定义时间格式 + * + * @param timeFormat 格式化 + * @param date 日期 + * @return + */ + public static String getDate(String timeFormat, Date date) { + DateFormat dateFormat = new SimpleDateFormat(timeFormat); + return dateFormat.format(date); + } + +} diff --git a/src/main/java/com/soft/line/service/impl/AppletCommonServiceImpl.java b/src/main/java/com/soft/line/service/impl/AppletCommonServiceImpl.java new file mode 100644 index 0000000..e1e426b --- /dev/null +++ b/src/main/java/com/soft/line/service/impl/AppletCommonServiceImpl.java @@ -0,0 +1,177 @@ +package com.soft.line.service.impl; + +import com.soft.line.mapper.AppletCommonMapper; +import com.soft.line.service.AppletCommonService; +import com.soft.line.util.exception.CommonResult; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; + +import java.io.File; +import java.util.*; + +/** + * 小程序 公用 + * + * @author wpb + * @version 1.0 + * @date 2020/6/1 9:10 + */ +@Slf4j +@Service +public class AppletCommonServiceImpl implements AppletCommonService { + + /** + * 文件上传路径 例如：D盘下的路径 + */ + @Value(value = "${uploadFileDir}") + private String uploadFileDir; + + + @Autowired + private AppletCommonMapper appletCommonMapper; + + @Override + public CommonResult>>> getBaseData() { + //返回数据 + Map>> map = new HashMap<>(0); + + //数据库数据 + List> mapList = appletCommonMapper.codeDetailMap(); + + if (mapList.size() > 0) { + + Set codeTypeSet = new HashSet<>(); + + for (Map mapData : mapList) { + codeTypeSet.add(mapData.get("codeType")); + } + + for (String codeType : codeTypeSet) { + //枚举数据集合 + List> listData = new ArrayList<>(); + for (Map mapInitial : mapList) { + //枚举数据 + Map mapData = new HashMap<>(0); + + if (codeType.equals(mapInitial.get("codeType"))) { + mapData.put("codeDetail", mapInitial.get("codeDetail")); + mapData.put("codeContent1", mapInitial.get("codeContent1")); + listData.add(mapData); + } + + } + map.put(codeType, listData); + } + } else { + return CommonResult.failed("枚举数据不存在"); + } + return CommonResult.success(map); + } + + + @Override + public CommonResult uploadContractAttach(MultipartFile file, int id, String fileName, String modifyPerson) { + File uploadRootFileDir = new File(uploadFileDir); + File fileDir = new File(uploadRootFileDir.getAbsolutePath(), "contract/" + id); + + if (!fileDir.exists()) { + fileDir.mkdirs(); + } + + //校验文件重名，不入附件表 但会删除老的，上传新的 + boolean checkName = false; + + //文件夹中已存在的文件 + File[] existingFiles = fileDir.listFiles(); + + for (File existingFile : existingFiles) { + //文件名一样就先删除 + if (existingFile.getName().equals(fileName)) { + checkName = true; + existingFile.delete(); + } + } + + File newFile = new File(fileDir.getAbsolutePath(), fileName); + + try { + file.transferTo(newFile); + } catch (Exception e) { + e.printStackTrace(); + log.error(e.getMessage(), e); + return CommonResult.failed("上传文件失败"); + } + + if (!checkName) { + //url地址 attachmentUrl + String attachmentUrl = "contract/" + id + "/" + fileName; + //标记时间 + Date modifyTime = new Date(); + + //附件类型（1：合同，2：证书） + String type = "1"; + //添加到附件表中 + int i = appletCommonMapper.addAnnex(fileName, attachmentUrl, modifyPerson, modifyTime, type, id); + //入库是否成功 + if (i != 1) { + return CommonResult.failed("文件入库失败，请再次上传"); + } + } + return CommonResult.success(null); + } + + @Override + public CommonResult uploadCertificateAttach(MultipartFile file, int id, String fileName, String modifyPerson) { + + File uploadRootFileDir = new File(uploadFileDir); + File fileDir = new File(uploadRootFileDir.getAbsolutePath(), "certificate/" + id); + + if (!fileDir.exists()) { + fileDir.mkdirs(); + } + + //校验文件重名，不入附件表 但会删除老的，上传新的 + boolean checkName = false; + + //文件夹中已存在的文件 + File[] existingFiles = fileDir.listFiles(); + + for (File existingFile : existingFiles) { + //文件名一样就先删除 + if (existingFile.getName().equals(fileName)) { + checkName = true; + existingFile.delete(); + } + } + + File newFile = new File(fileDir.getAbsolutePath(), fileName); + + try { + file.transferTo(newFile); + } catch (Exception e) { + e.printStackTrace(); + log.error(e.getMessage(), e); + return CommonResult.failed("上传文件失败"); + } + + if (!checkName) { + //url地址 attachmentUrl + String attachmentUrl = "certificate/" + id + "/" + fileName; + //标记时间 + Date modifyTime = new Date(); + + //附件类型（1：合同，2：证书） + String type = "2"; + //添加到附件表中 + int i = appletCommonMapper.addAnnex(fileName, attachmentUrl, modifyPerson, modifyTime, type, id); + //入库是否成功 + if (i != 1) { + return CommonResult.failed("文件入库失败，请再次上传"); + } + } + return CommonResult.success(null); + } +} diff --git a/src/main/java/com/soft/line/service/impl/AppletContractServiceImpl.java b/src/main/java/com/soft/line/service/impl/AppletContractServiceImpl.java new file mode 100644 index 0000000..3316455 --- /dev/null +++ b/src/main/java/com/soft/line/service/impl/AppletContractServiceImpl.java @@ -0,0 +1,320 @@ +package com.soft.line.service.impl; + +import com.soft.line.common.AppletSystemConstant; +import com.soft.line.entity.ContractInfo; +import com.soft.line.mapper.AppletCommonMapper; +import com.soft.line.mapper.AppletContractMapper; +import com.soft.line.service.AppletContractService; +import com.soft.line.util.exception.CommonResult; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.io.File; +import java.text.DateFormat; +import java.text.SimpleDateFormat; +import java.util.*; + +/** + * 小程序合同serviceImpl + * + * @author wpb + * @version 1.0 + * @date 2020/5/26 15:47 + */ +@Service +@Slf4j +public class AppletContractServiceImpl implements AppletContractService { + + /** + * 虚拟 + */ + @Value("${uploadFileMapping}") + private String uploadFileMappingUrl; + + /** + * 文件上传路径 例如：D盘下的路径 + */ + @Value(value = "${uploadFileDir}") + private String uploadFileDir; + + @Autowired + private AppletContractMapper appletContractMapper; + + @Autowired + private AppletCommonMapper appletCommonMapper; + + @Override + public CommonResult> getContractNum() { + Map map = new HashMap<>(0); + List> mapList = appletContractMapper.contractNum(); + //查询所有部门 code_detail + List deptIds = appletCommonMapper.codeDetailList(AppletSystemConstant.CODE_TYPE_DEPT); + if (deptIds.size() > 0) { + for (String deptId : deptIds) { + map.put(deptId, 0); + } + for (Map mapData : mapList) { + for (String deptId : deptIds) { + if (deptId.equals(String.valueOf(mapData.get("depId")))) { + map.put(deptId, mapData.get("value")); + } + } + } + } else { + return CommonResult.failed("查询部门出错"); + } + return CommonResult.success(map); + } + + @Override + public CommonResult>> getContractYearList(Map paraMap) { + + //获取今年字符串 例：2020 + String year = getDate("yyyy", new Date()); + //设置 部门合同年列表初始值 + + List> list = new ArrayList<>(); + + for (int i = Integer.parseInt(year); i > AppletSystemConstant.ASSIGN_YEAR; i--) { + Map map = new HashMap<>(0); + map.put("signTime", String.valueOf(i)); + map.put("num", AppletSystemConstant.NUM); + list.add(map); + } + + Map map = new HashMap<>(0); + map.put("signTime", AppletSystemConstant.NUM); + map.put("num", AppletSystemConstant.NUM); + list.add(map); + + //根据部门id获取合同年列表数据 + List> mapLists = appletContractMapper.getContractYearList(paraMap); + + if (mapLists.size() > 0) { + //2005 年之前的，不包含2005 + int num = 0; + int time = 2005; + for (Map mapYear : mapLists) { + if (Integer.parseInt(mapYear.get("signTime").toString()) < time) { + num += Integer.parseInt(mapYear.get("num").toString()); + } + } + + //数据处理 + + for (Map mapList : list) { + for (Map mapData : mapLists) { + if (Integer.parseInt(mapList.get("signTime").toString()) != 0) { + if (mapList.get("signTime").equals(mapData.get("signTime"))) { + mapList.put("num", mapData.get("num")); + } + } else { + mapList.put("num", num); + } + } + } + } + + return CommonResult.success(list); + } + + @Override + public CommonResult> getContractList(Map paraMap) { + Map map = new HashMap<>(0); + //从第几条开始 + int num = ((int) paraMap.get("pageNum") - 1) * ((int) paraMap.get("dataNum")); + paraMap.put("pageNum", num); + + List> mapList = appletContractMapper.getContractList(paraMap); + + //条件下的总个数 + int i = appletContractMapper.countContractList(paraMap.get("depId").toString(),paraMap.get("signTime").toString()); + + //总个数大于 当前数据+10 + map.put("hasMore", i > (num + ((int) paraMap.get(AppletSystemConstant.DATA_NUM)))); + map.put("contractList", mapList); + + return CommonResult.success(map); + } + + + @Override + public CommonResult> getContractSearchList(Map paraMap) { + Map map = new HashMap<>(0); + //从第几条开始 + int num = ((int) paraMap.get("pageNum") - 1) * ((int) paraMap.get("dataNum")); + paraMap.put("pageNum", num); + + List> mapList = appletContractMapper.getContractSearchList(paraMap); + + //条件下的总个数 + int i = appletContractMapper.countContractSearchList(paraMap.get("contractName").toString()); + + //总个数大于 当前数据+10 + map.put("hasMore", i > (num + ((int) paraMap.get(AppletSystemConstant.DATA_NUM)))); + map.put("contractList", mapList); + + return CommonResult.success(map); + } + + @Override + public CommonResult> getContractQueryList(Map paraMap) { + Map map = new HashMap<>(0); + //从第几条开始 + int num = ((int) paraMap.get("pageNum") - 1) * ((int) paraMap.get("dataNum")); + paraMap.put("pageNum", num); + + List> mapList = appletContractMapper.getContractQueryList(paraMap); + + //条件下的总个数 + int i = appletContractMapper.countContractQueryList(paraMap); + + //总个数大于 当前数据+10 + map.put("hasMore", i > (num + ((int) paraMap.get(AppletSystemConstant.DATA_NUM)))); + map.put("contractList", mapList); + + return CommonResult.success(map); + } + + @Override + public CommonResult> addContract(ContractInfo contractInfo) { + if (appletContractMapper.checkContractByName(contractInfo.getContractName()) != 0) { + return CommonResult.failed("合同已存在"); + } + + //默认不删除 + contractInfo.setDelFlg("0"); + //日期 + contractInfo.setModifyTime(new Date()); + + int i = appletContractMapper.addContract(contractInfo); + Map map = new HashMap<>(0); + if (i == 1) { + map.put("id", contractInfo.getId()); + } else { + CommonResult.failed("添加合同失败"); + } + return CommonResult.success(map); + } + + @Override + public CommonResult updateContract(Map paraMap) { + if (appletContractMapper.checkContractByNameAndId(String.valueOf(paraMap.get("contractName")), (int) paraMap.get("id")) != 0) { + return CommonResult.failed("合同已存在"); + } + + paraMap.put("modifyTime", new Date()); + int count = appletContractMapper.updateContract(paraMap); + + if (count != 1) { + return CommonResult.failed("修改合同失败"); + } + //对附件的操作 告诉编译器忽略 unchecked 警告信息，如使用List，ArrayList等未进行参数化产生的警告信息。 + @SuppressWarnings("unchecked") + List> annexList = (List>) paraMap.get("deleteAttachmentList"); + + StringBuilder deleteErrorMsg = new StringBuilder(); + + if (annexList.size() > 0) { + + //执行删除 + for (Map map : annexList) { + //附件表 url + String attachmentUrl = (String) map.get("attachmentUrl"); + String fileUrl = attachmentUrl.substring(attachmentUrl.indexOf(uploadFileMappingUrl) + 12); + + //删除附件文件 + File fileDir = new File(uploadFileDir + fileUrl); + boolean deleteResult = fileDir.delete(); + + if (!deleteResult) { + //deleteErrorMsg += "，删除文件：" + attachmentUrl.substring(attachmentUrl.lastIndexOf("/")) + "失败"; + deleteErrorMsg.append("，删除文件：").append(attachmentUrl.substring(attachmentUrl.lastIndexOf("/"))).append("失败"); + } else { + appletCommonMapper.delAnnex((int) map.get("id")); + } + + } + } + + return CommonResult.success(null, "修改合同成功" + deleteErrorMsg); + } + + @Override + public CommonResult> getContract(Map paraMap) { + //合同详情 + Map map = appletContractMapper.getContract(paraMap); + if (map == null || map.isEmpty()) { + return CommonResult.failed("未查询出结果"); + } + //附件详情 + int cId = (int) paraMap.get("id"); + String type = "1"; + List> getAnnexesList = appletCommonMapper.getAnnexes(cId, type); + + List> annexesList = new ArrayList<>(); + // 拼 路径 uploadFileMappingUrl + for (Map mapAnnex : getAnnexesList) { + mapAnnex.put("attachmentUrl", uploadFileMappingUrl + mapAnnex.get("attachmentUrl")); + annexesList.add(mapAnnex); + } + + map.put("attachmentList", annexesList); + return CommonResult.success(map); + } + + /** + * 删除合同 + * + * @param paraMap 参数 + */ + @Override + public CommonResult deleteContract(Map paraMap) { + //删除时间 + paraMap.put("modifyTime", new Date()); + //删除状态 + paraMap.put("delFlg", "1"); + int i = appletContractMapper.deleteContract(paraMap); + if (i != 1) { + return CommonResult.failed("删除合同失败"); + } else { + //附件信息 + List> oldAttachments = appletCommonMapper.getAnnexes((int) paraMap.get("id"), "1"); + + //删除附件 + for (Map map : oldAttachments) { + //附件表 url + String attachmentUrl = (String) map.get("attachmentUrl"); + + //删除附件文件 + File fileDir = new File(uploadFileDir + attachmentUrl); + + boolean deleteResult = fileDir.delete(); + + //删除附件基本信息 + if (deleteResult) { + appletCommonMapper.delAnnex((int) map.get("id")); + } + } + + return CommonResult.success("删除合同成功"); + } + } + + /** + * 自定义时间格式 + * + * @param timeFormat 格式化 + * @param date 日期 + * @return + */ + public static String getDate(String timeFormat, Date date) { + DateFormat dateFormat = new SimpleDateFormat(timeFormat); + return dateFormat.format(date); + } + + +} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index fa5dce4..cf9eb6c 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -48,4 +48,14 @@ uploadFileDir=D:/softline-files-manage-uploadFiles/ #uploadFileDir=user/softline-files-manage-uploadFiles/ #ļϴӳַ -uploadFileMapping=uploadFiles/ \ No newline at end of file +uploadFileMapping=uploadFiles/ + +spring.http.encoding.force=true +spring.http.encoding.charset=UTF-8 +spring.http.encoding.enabled=true +server.tomcat.uri-encoding=UTF-8 +### ļϴ +# ֵ֧ļ +spring.servlet.multipart.max-file-size=20MB +# ļ +spring.servlet.multipart.max-request-size=100MB \ No newline at end of file -- Gitee From 725fbf66331c8ae4fde2ec4adfdd5d60e248d53e Mon Sep 17 00:00:00 2001 From: ljc Date: Tue, 9 Jun 2020 11:26:31 +0800 Subject: [PATCH 096/211] =?UTF-8?q?=E5=90=88=E5=90=8C=E8=AF=81=E4=B9=A6?= =?UTF-8?q?=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/soft/line/util/poi/PoiUtils.java | 71 ++++++++++++------- 1 file changed, 46 insertions(+), 25 deletions(-) diff --git a/src/main/java/com/soft/line/util/poi/PoiUtils.java b/src/main/java/com/soft/line/util/poi/PoiUtils.java index 9c7b8b1..2b72b97 100644 --- a/src/main/java/com/soft/line/util/poi/PoiUtils.java +++ b/src/main/java/com/soft/line/util/poi/PoiUtils.java @@ -6,13 +6,10 @@ import com.soft.line.entity.ContractInfo; import com.soft.line.service.CertificateInfoService; import com.soft.line.service.CodeDetailService; import com.soft.line.service.ContractInfoService; -import com.soft.line.util.jackson.converter.StringToDateUtil; import com.soft.line.util.jackson.converter.StringToDoubleUtil; import org.apache.poi.hssf.usermodel.*; import org.apache.poi.ss.usermodel.*; import org.apache.poi.xssf.usermodel.XSSFWorkbook; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; import org.springframework.web.multipart.MultipartFile; import javax.annotation.PostConstruct; @@ -22,6 +19,8 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.math.BigDecimal; +import java.text.DateFormat; +import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; import java.util.regex.Matcher; @@ -197,7 +196,7 @@ public class PoiUtils { List certificateInfoList = new ArrayList(); CertificateInfo cert = null; Map map = new HashMap(); - String warningMsg=null; + String warningMsg=""; String chgrow = "\r\n"; try { String fileName = file.getOriginalFilename(); @@ -235,6 +234,7 @@ public class PoiUtils { cert = new CertificateInfo(); for (int k = 0; k < physicalNumberOfCells; k++) { Cell cell = row.getCell(k); + cell.setCellType(CellType.STRING); String cellValue = cell.getStringCellValue(); CodeDetail cd = null; switch (k) { @@ -242,7 +242,7 @@ public class PoiUtils { //证书类型 cd = codeDetailService.selectByCodeContent1("3",cellValue); if (cd==null){ - warningMsg+="第"+j+"行证书类型不存在"; + warningMsg+="第"+j+"行证书类型不存在 "; }else{ cert.setCertType(cd.getCodeDetail()); } @@ -250,7 +250,7 @@ public class PoiUtils { case 1: //证书名称 if (cellValue==null||"".equals(cellValue)){ - warningMsg+="第"+j+"行证书名称不存在"; + warningMsg+="第"+j+"行证书名称不存在 "; }else{ cert.setCertName(cellValue); } @@ -262,7 +262,7 @@ public class PoiUtils { case 3: //颁奖单位 if (cellValue == null || "".equals(cellValue)) { - warningMsg += "第" + j + "行颁奖单位为空" ; + warningMsg += "第" + j + "行颁奖单位为空 " ; } else { cert.setCertUnit(cellValue); } @@ -270,9 +270,9 @@ public class PoiUtils { case 4: //证书编号 if (cellValue == null || "".equals(cellValue)) { - warningMsg += "第" + j + "行证书编号为空" ; + warningMsg += "第" + j + "行证书编号为空 " ; }else if(certificateInfoService.countByCId(null, cellValue) > 0){ - warningMsg += "第" + j + "行存在相同的证书编号" ; + warningMsg += "第" + j + "行存在相同的证书编号 " ; } else { cert.setCertId(cellValue); } @@ -282,7 +282,7 @@ public class PoiUtils { if(!isDate(cellValue)){ warningMsg += "第" + j + "行发证日期格式错误!日期样式：【20100101】" ; }else{ - cert.setBeginDate(StringToDateUtil.convert(cellValue)); + cert.setBeginDate(StringToDate(cellValue)); } break; case 6: @@ -290,11 +290,11 @@ public class PoiUtils { if (!isDate(cellValue)) { warningMsg += "第" + j + "行到期日期格式错误!日期样式：【20100101】"; } else { - cert.setEndDate(StringToDateUtil.convert(cellValue)); + cert.setEndDate(StringToDate(cellValue)); } if (cert.getBeginDate() != null && cert.getEndDate() != null) { if (cert.getBeginDate().after(cert.getEndDate())) { - warningMsg += "第" + j + "行发证日期大于到期日期"; + warningMsg += "第" + j + "行发证日期大于到期日期 "; } } break; @@ -365,7 +365,7 @@ public class PoiUtils { //部门 cd = codeDetailService.selectByCodeContent1("1",cellValue); if (cd==null){ - warningMsg+="第"+j+"行部门不存在"; + warningMsg+="第"+j+"行部门不存在 "; }else{ cont.setDepId(cd.getCodeDetail()); } @@ -374,7 +374,7 @@ public class PoiUtils { //项目类型 cd = codeDetailService.selectByCodeContent1("2",cellValue); if (cd==null){ - warningMsg+="第"+j+"行项目类型不存在"; + warningMsg+="第"+j+"行项目类型不存在 "; }else{ cont.setProId(cd.getCodeDetail()); } @@ -382,9 +382,9 @@ public class PoiUtils { case 2: //合同名称 if(cellValue==null||"".equals(cellValue)){ - warningMsg+="第"+j+"行合同名称为空"; + warningMsg+="第"+j+"行合同名称为空 "; }else if(contractInfoService.countContractByIdAndName(null,cellValue)>0){ - warningMsg+="第"+j+"行存在相同的合同名称"; + warningMsg+="第"+j+"行存在相同的合同名称 "; } else{ cont.setContractName(cellValue); @@ -393,7 +393,7 @@ public class PoiUtils { case 3: //第一签约方 if (cellValue == null || "".equals(cellValue)) { - warningMsg += "第" + j + "行第一签约方为空" ; + warningMsg += "第" + j + "行第一签约方为空 " ; } else { cont.setPartA(cellValue); } @@ -401,7 +401,7 @@ public class PoiUtils { case 4: //第二签约方 if (cellValue == null || "".equals(cellValue)) { - warningMsg += "第" + j + "行第二签约方为空" ; + warningMsg += "第" + j + "行第二签约方为空 " ; } else { cont.setPartB(cellValue); } @@ -419,7 +419,7 @@ public class PoiUtils { if(!isDate(cellValue)){ warningMsg += "第" + j + "行签约日期格式错误!日期样式：【20100101】" ; }else{ - cont.setSignTime(StringToDateUtil.convert(cellValue)); + cont.setSignTime(StringToDate(cellValue)); } break; case 7: @@ -427,7 +427,7 @@ public class PoiUtils { if(!isDate(cellValue)){ warningMsg += "第" + j + "行起始日期格式错误!日期样式：【20100101】" ; }else{ - cont.setBeginDate(StringToDateUtil.convert(cellValue)); + cont.setBeginDate(StringToDate(cellValue)); } break; case 8: @@ -435,20 +435,20 @@ public class PoiUtils { if(!isDate(cellValue)){ warningMsg += "第" + j + "行终止日期格式错误!日期样式：【20100101】" ; }else{ - cont.setEndDate(StringToDateUtil.convert(cellValue)); + cont.setEndDate(StringToDate(cellValue)); } if (cont.getBeginDate()!=null&&cont.getEndDate()!=null){ if(cont.getBeginDate().after(cont.getEndDate())){ - warningMsg += "第" + j + "行起始日期大于终止日期" ; + warningMsg += "第" + j + "行起始日期大于终止日期 " ; } } break; case 9: //总金额 if (cellValue == null || "".equals(cellValue)) { - warningMsg += "第" + j + "行总金额为空" ; + warningMsg += "第" + j + "行总金额为空 " ; } else if(!isNumber(cellValue)){ - warningMsg += "第" + j + "行总金额不是数字" ; + warningMsg += "第" + j + "行总金额不是数字 " ; }else { cont.setTotalAmount(new BigDecimal(StringToDoubleUtil.convert(cellValue))); } @@ -456,7 +456,7 @@ public class PoiUtils { case 10: //付款方式 if (cellValue == null || "".equals(cellValue)) { - warningMsg += "第" + j + "行付款方式为空" ; + warningMsg += "第" + j + "行付款方式为空 " ; } else { cont.setPayment(cellValue); } @@ -547,4 +547,25 @@ public class PoiUtils { } } + public static Date StringToDate(String source) { + source = source.trim(); + + Date date = null; + boolean flag = false; + DateFormat dateFormat =new SimpleDateFormat("yyyyMMdd"); + try { + date = dateFormat.parse(source); + flag = true; + } catch (ParseException e) { + // e.printStackTrace(); + } + + if (flag) { + return date; + } else { + throw new IllegalArgumentException("不能解析日期:" + source); + } + + } + } -- Gitee From 26b160ef65bd4a8908768e8a71ac58fa0f79e2c6 Mon Sep 17 00:00:00 2001 From: wpb <1121178778@qq.com> Date: Tue, 9 Jun 2020 13:41:57 +0800 Subject: [PATCH 097/211] =?UTF-8?q?=E6=B7=BB=E5=8A=A0EnableWebMvc=E6=B3=A8?= =?UTF-8?q?=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/soft/line/common/WebMvcConfig.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/com/soft/line/common/WebMvcConfig.java b/src/main/java/com/soft/line/common/WebMvcConfig.java index d018b5f..56fe448 100644 --- a/src/main/java/com/soft/line/common/WebMvcConfig.java +++ b/src/main/java/com/soft/line/common/WebMvcConfig.java @@ -2,6 +2,7 @@ package com.soft.line.common; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Configuration; +import org.springframework.web.servlet.config.annotation.EnableWebMvc; import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; @@ -12,6 +13,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; * @date: 2020年3月30日 下午5:09:03 */ @Configuration +@EnableWebMvc public class WebMvcConfig implements WebMvcConfigurer { @Value("${uploadFileDir}") -- Gitee From 32a9ff2ca9bf66829c41548680548f8211510ad0 Mon Sep 17 00:00:00 2001 From: wpb <1121178778@qq.com> Date: Wed, 10 Jun 2020 17:51:52 +0800 Subject: [PATCH 098/211] =?UTF-8?q?=E6=B7=BB=E5=8A=A0EnableWebMvc=E6=B3=A8?= =?UTF-8?q?=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../soft/line/service/impl/AppletContractServiceImpl.java | 8 ++++++++ src/main/resources/application.properties | 2 ++ 2 files changed, 10 insertions(+) diff --git a/src/main/java/com/soft/line/service/impl/AppletContractServiceImpl.java b/src/main/java/com/soft/line/service/impl/AppletContractServiceImpl.java index 3316455..8edc68d 100644 --- a/src/main/java/com/soft/line/service/impl/AppletContractServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/AppletContractServiceImpl.java @@ -250,6 +250,14 @@ public class AppletContractServiceImpl implements AppletContractService { if (map == null || map.isEmpty()) { return CommonResult.failed("未查询出结果"); } + + //如果值为null 转化为"" + for (String key: map.keySet()) { + if (map.get(key)==null){ + map.put(key,""); + } + } + //附件详情 int cId = (int) paraMap.get("id"); String type = "1"; diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index cf9eb6c..b2b5f66 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -40,6 +40,8 @@ pagehelper.support-methods-arguments=true #mybatis.mapper-locations=com.soft.line.mapper/*.xml #ʵ· mybatis.type-aliases-package=com.soft.line.entity +#ʹmapʱ ѯijһȫΪnullʱҲش +mybatis.configuration.call-setters-on-nulls=true #ļϴַ #windows -- Gitee From b450814024a98c22ec2448b0711a88748bb3b1de Mon Sep 17 00:00:00 2001 From: ljc Date: Wed, 10 Jun 2020 20:07:30 +0800 Subject: [PATCH 099/211] =?UTF-8?q?=E5=90=AF=E7=94=A8=E6=9C=AC=E5=9C=B0?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application.properties | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index fa5dce4..73c3470 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,6 +1,7 @@ -server.port=9100 +server.port=9101 server.servlet.context-path=/softline -spring.datasource.url= jdbc:mysql://175.24.112.245:3306/rz_archives?characterEncoding=utf-8&useSSL=false +#spring.datasource.url= jdbc:mysql://175.24.112.245:3306/rz_archives?characterEncoding=utf-8&useSSL=false +spring.datasource.url= jdbc:mysql://127.0.0.1:3306/rz_archives?characterEncoding=utf-8&useSSL=false spring.datasource.username=root spring.datasource.password=root spring.datasource.driver-class-name=com.mysql.jdbc.Driver -- Gitee From fee7b18e44adec2d04a6f3f3658159ec42acf54c Mon Sep 17 00:00:00 2001 From: wpb <1121178778@qq.com> Date: Thu, 11 Jun 2020 08:51:28 +0800 Subject: [PATCH 100/211] =?UTF-8?q?mybatis=E8=BF=94=E5=9B=9E=E5=80=BC?= =?UTF-8?q?=E4=B8=BAmap=E6=97=B6=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index b2b5f66..dcb91f5 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -40,6 +40,7 @@ pagehelper.support-methods-arguments=true #mybatis.mapper-locations=com.soft.line.mapper/*.xml #ʵ· mybatis.type-aliases-package=com.soft.line.entity + #ʹmapʱ ѯijһȫΪnullʱҲش mybatis.configuration.call-setters-on-nulls=true -- Gitee From 79e5005c3e4916d72a00fc40da03b5ae2c2f1d80 Mon Sep 17 00:00:00 2001 From: wpb <1121178778@qq.com> Date: Thu, 11 Jun 2020 08:56:49 +0800 Subject: [PATCH 101/211] =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=80=BC=E4=B8=BAnul?= =?UTF-8?q?l=E6=97=B6=EF=BC=8C=E8=BD=AC=E5=A4=96""?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../line/service/impl/AppletCertificateServiceImpl.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/main/java/com/soft/line/service/impl/AppletCertificateServiceImpl.java b/src/main/java/com/soft/line/service/impl/AppletCertificateServiceImpl.java index 231a9dd..852892f 100644 --- a/src/main/java/com/soft/line/service/impl/AppletCertificateServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/AppletCertificateServiceImpl.java @@ -148,6 +148,13 @@ public class AppletCertificateServiceImpl implements AppletCertificateService { return CommonResult.failed("未查询出结果"); } + //如果值为null 转化为"" + for (String key: certificate.keySet()) { + if (certificate.get(key)==null){ + certificate.put(key,""); + } + } + //附件详情 List> attachmentList = appletCommonMapper.getAnnexes(Integer.parseInt(paramMap.get("id").toString()), "2"); //拼接路径 -- Gitee From b7a2ab8408cc32f120b7eafa2f581a03ea1be4e6 Mon Sep 17 00:00:00 2001 From: wpb <1121178778@qq.com> Date: Thu, 11 Jun 2020 13:39:13 +0800 Subject: [PATCH 102/211] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=81=E4=B9=A6?= =?UTF-8?q?=E8=BF=B7=E7=B3=8A=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/soft/line/mapper/AppletCertificateMapper.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/soft/line/mapper/AppletCertificateMapper.xml b/src/main/java/com/soft/line/mapper/AppletCertificateMapper.xml index 4350995..81c37cf 100644 --- a/src/main/java/com/soft/line/mapper/AppletCertificateMapper.xml +++ b/src/main/java/com/soft/line/mapper/AppletCertificateMapper.xml @@ -195,7 +195,7 @@ and cert_type like concat('%',#{certType},'%') - and certId like concat('%',#{certId},'%') + and cert_id like concat('%',#{certId},'%') and project_name like concat('%',#{projectName},'%') @@ -204,10 +204,10 @@ and cert_unit like concat('%',#{certUnit},'%') - SUBSTR(begin_date,1,11) >= beginDate + and SUBSTR(begin_date,1,11) >= beginDate - SUBSTR(begin_date,1,11) <= endDate + and SUBSTR(begin_date,1,11) <= endDate ORDER BY modify_time desc LIMIT #{pageNum},#{dataNum} -- Gitee From 32bfe710efceebb681ddbaea553d4d594371870f Mon Sep 17 00:00:00 2001 From: wpb <1121178778@qq.com> Date: Thu, 11 Jun 2020 13:44:42 +0800 Subject: [PATCH 103/211] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=81=E4=B9=A6?= =?UTF-8?q?=E8=BF=B7=E7=B3=8A=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/soft/line/mapper/AppletCertificateMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/soft/line/mapper/AppletCertificateMapper.xml b/src/main/java/com/soft/line/mapper/AppletCertificateMapper.xml index 81c37cf..c2e8aaf 100644 --- a/src/main/java/com/soft/line/mapper/AppletCertificateMapper.xml +++ b/src/main/java/com/soft/line/mapper/AppletCertificateMapper.xml @@ -207,7 +207,7 @@ and SUBSTR(begin_date,1,11) >= beginDate - and SUBSTR(begin_date,1,11) <= endDate + and SUBSTR(end_date,1,11) <= endDate ORDER BY modify_time desc LIMIT #{pageNum},#{dataNum} -- Gitee From 4d7c7a1fafcaa8a98a018e7ed25211afa45338f3 Mon Sep 17 00:00:00 2001 From: wpb <1121178778@qq.com> Date: Thu, 11 Jun 2020 13:48:17 +0800 Subject: [PATCH 104/211] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=81=E4=B9=A6?= =?UTF-8?q?=E8=BF=B7=E7=B3=8A=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/soft/line/mapper/AppletCertificateMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/soft/line/mapper/AppletCertificateMapper.xml b/src/main/java/com/soft/line/mapper/AppletCertificateMapper.xml index c2e8aaf..edd6d2f 100644 --- a/src/main/java/com/soft/line/mapper/AppletCertificateMapper.xml +++ b/src/main/java/com/soft/line/mapper/AppletCertificateMapper.xml @@ -204,10 +204,10 @@ and cert_unit like concat('%',#{certUnit},'%') - and SUBSTR(begin_date,1,11) >= beginDate + and SUBSTR(begin_date,1,11) >= #{beginDate} - and SUBSTR(end_date,1,11) <= endDate + and SUBSTR(end_date,1,11) <= #{endDate} ORDER BY modify_time desc LIMIT #{pageNum},#{dataNum} -- Gitee From 9d322c6cf2618ca458a8308dee7d7a3c06d95cc7 Mon Sep 17 00:00:00 2001 From: wpb <1121178778@qq.com> Date: Thu, 11 Jun 2020 13:54:19 +0800 Subject: [PATCH 105/211] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=81=E4=B9=A6?= =?UTF-8?q?=E8=BF=B7=E7=B3=8A=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/soft/line/mapper/AppletCertificateMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/soft/line/mapper/AppletCertificateMapper.xml b/src/main/java/com/soft/line/mapper/AppletCertificateMapper.xml index edd6d2f..ef53d95 100644 --- a/src/main/java/com/soft/line/mapper/AppletCertificateMapper.xml +++ b/src/main/java/com/soft/line/mapper/AppletCertificateMapper.xml @@ -236,7 +236,7 @@ SUBSTR(begin_date,1,11) >= beginDate - SUBSTR(begin_date,1,11) <= endDate + SUBSTR(end_date,1,11) <= endDate -- Gitee From 30ae78e5ab705ca0ec04713d30d8366da5e13d9f Mon Sep 17 00:00:00 2001 From: wpb <1121178778@qq.com> Date: Thu, 11 Jun 2020 14:00:38 +0800 Subject: [PATCH 106/211] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=81=E4=B9=A6?= =?UTF-8?q?=E8=BF=B7=E7=B3=8A=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/soft/line/mapper/AppletCertificateMapper.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/soft/line/mapper/AppletCertificateMapper.xml b/src/main/java/com/soft/line/mapper/AppletCertificateMapper.xml index ef53d95..2621f2c 100644 --- a/src/main/java/com/soft/line/mapper/AppletCertificateMapper.xml +++ b/src/main/java/com/soft/line/mapper/AppletCertificateMapper.xml @@ -224,7 +224,7 @@ and cert_type like concat('%',#{certType},'%') - and certId like concat('%',#{certId},'%') + and cert_id like concat('%',#{certId},'%') and project_name like concat('%',#{projectName},'%') @@ -233,10 +233,10 @@ and cert_unit like concat('%',#{certUnit},'%') - SUBSTR(begin_date,1,11) >= beginDate + and SUBSTR(begin_date,1,11) >= #{beginDate} - SUBSTR(end_date,1,11) <= endDate + and SUBSTR(end_date,1,11) <= #{endDate} -- Gitee From 5b9e95f02b298ca90f2f49293c93574c4bacf9e1 Mon Sep 17 00:00:00 2001 From: wpb <1121178778@qq.com> Date: Thu, 11 Jun 2020 14:08:28 +0800 Subject: [PATCH 107/211] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=81=E4=B9=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/soft/line/mapper/AppletCertificateMapper.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/soft/line/mapper/AppletCertificateMapper.xml b/src/main/java/com/soft/line/mapper/AppletCertificateMapper.xml index 2621f2c..e0356a4 100644 --- a/src/main/java/com/soft/line/mapper/AppletCertificateMapper.xml +++ b/src/main/java/com/soft/line/mapper/AppletCertificateMapper.xml @@ -238,6 +238,7 @@ and SUBSTR(end_date,1,11) <= #{endDate} + \ No newline at end of file -- Gitee From 7164a04b4dee2f4f05f337b71b7e16b80b90ad50 Mon Sep 17 00:00:00 2001 From: ljc Date: Fri, 12 Jun 2020 17:38:25 +0800 Subject: [PATCH 108/211] =?UTF-8?q?=E9=99=84=E4=BB=B6=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/soft/line/common/WebMvcConfig.java | 4 + .../line/controller/AttachmentController.java | 19 ++- .../line/mapper/AttachmentInfoMapper.java | 18 +-- .../soft/line/mapper/AttachmentInfoMapper.xml | 11 +- .../line/service/AttachMentInfoService.java | 2 +- .../impl/AttachmentInfoServiceImpl.java | 120 +++++++++++++----- .../util/config/ResourceConfigAdapter.java | 40 ------ src/main/resources/application.properties | 2 +- 8 files changed, 114 insertions(+), 102 deletions(-) delete mode 100644 src/main/java/com/soft/line/util/config/ResourceConfigAdapter.java diff --git a/src/main/java/com/soft/line/common/WebMvcConfig.java b/src/main/java/com/soft/line/common/WebMvcConfig.java index 56fe448..65d4b90 100644 --- a/src/main/java/com/soft/line/common/WebMvcConfig.java +++ b/src/main/java/com/soft/line/common/WebMvcConfig.java @@ -25,5 +25,9 @@ public class WebMvcConfig implements WebMvcConfigurer { @Override public void addResourceHandlers(ResourceHandlerRegistry registry) { registry.addResourceHandler("/" + uploadFileMappingUrl + "**").addResourceLocations("file:///" + uploadFileDir); + registry.addResourceHandler("swagger-ui.html") + .addResourceLocations("classpath:/META-INF/resources/"); + registry.addResourceHandler("/webjars/**") + .addResourceLocations("classpath:/META-INF/resources/webjars/"); } } diff --git a/src/main/java/com/soft/line/controller/AttachmentController.java b/src/main/java/com/soft/line/controller/AttachmentController.java index 9175ba1..f98e0d9 100644 --- a/src/main/java/com/soft/line/controller/AttachmentController.java +++ b/src/main/java/com/soft/line/controller/AttachmentController.java @@ -1,13 +1,12 @@ package com.soft.line.controller; +import com.soft.line.entity.AttachmentInfo; import com.soft.line.service.AttachMentInfoService; import com.soft.line.util.exception.CommonResult; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; -import org.apache.ibatis.annotations.Param; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -23,13 +22,15 @@ public class AttachmentController { private AttachMentInfoService attachMentInfoService; @ApiOperation(value = "获取附件列表", notes = "获取附件列表") - @PostMapping("/attachment/{attachmentType}/{id} ") + @GetMapping("/attachment/{attachmentType}/{id}") public CommonResult getAll(@PathVariable("attachmentType") String attachmentType,@PathVariable("id") Integer id){ + System.out.println("attachmentType:"+attachmentType); return CommonResult.success(attachMentInfoService.selectAll(attachmentType,id)); } + @ApiOperation(value = "删除附件", notes = "删除附件") - @PostMapping("/attachment") + @DeleteMapping("/attachment") public CommonResult delete(@RequestBody Map map){ attachMentInfoService.delete(map); return CommonResult.success("删除成功"); @@ -37,13 +38,9 @@ public class AttachmentController { @ApiOperation(value = "上传附件", notes = "上传附件") @PostMapping("/upload") - public CommonResult upload(MultipartFile[] uploadFiles,@RequestBody Map map){ - return CommonResult.success(attachMentInfoService.save(uploadFiles,map)); + public CommonResult upload(@RequestParam("file") MultipartFile uploadFile, + @RequestParam("type") String type,@RequestParam("cId")Integer cId){ + return CommonResult.success(attachMentInfoService.save(uploadFile,type,cId)); } - @ApiOperation(value = "上传附件检查", notes = "上传附件检查") - @PostMapping("/uploadCheck") - public CommonResult uploadCheck(MultipartFile[] uploadFiles,@RequestBody Map map){ - return CommonResult.success(attachMentInfoService.save(uploadFiles,map)); - } } diff --git a/src/main/java/com/soft/line/mapper/AttachmentInfoMapper.java b/src/main/java/com/soft/line/mapper/AttachmentInfoMapper.java index d731eef..473a0e8 100644 --- a/src/main/java/com/soft/line/mapper/AttachmentInfoMapper.java +++ b/src/main/java/com/soft/line/mapper/AttachmentInfoMapper.java @@ -4,6 +4,7 @@ package com.soft.line.mapper; import com.soft.line.entity.AttachmentInfo; import org.apache.ibatis.annotations.Param; +import java.util.Date; import java.util.List; import java.util.Map; @@ -18,23 +19,14 @@ public interface AttachmentInfoMapper { int delete(@Param("attachmentType") String attachmentType,@Param("cId") Integer cId); - int deleteFile(Map map); + int deleteFileRecord(AttachmentInfo record); + + int deleteFileMap(Map map); - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table attachment_info - * - * @mbggenerated - */ AttachmentInfo selectByPrimaryKey(Integer id); - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table attachment_info - * - * @mbggenerated - */ List selectAll(@Param("attachmentType") String attachmentType,@Param("cId") Integer cId); List selectAllByTypeAndName(@Param("attachmentType") String attachmentType,@Param("attachmentName") String attachmentName); + } \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/AttachmentInfoMapper.xml b/src/main/java/com/soft/line/mapper/AttachmentInfoMapper.xml index d49f5d7..7830d8d 100644 --- a/src/main/java/com/soft/line/mapper/AttachmentInfoMapper.xml +++ b/src/main/java/com/soft/line/mapper/AttachmentInfoMapper.xml @@ -18,14 +18,18 @@ insert into `attachment_info` (`attachment_name`, `attachment_url`, `modify_person`, `modify_time`,`type`,`c_id`) values (#{attachmentName,jdbcType=VARCHAR}, #{attachmentUrl,jdbcType=VARCHAR}, #{modifyPerson,jdbcType=VARCHAR}, - #{modifyTime,jdbcType=TIMESTAMP}),#{type,jdbcType=VARCHAR},#{cId,jdbcType=INTEGER} + #{modifyTime,jdbcType=TIMESTAMP},#{type,jdbcType=VARCHAR},#{cId,jdbcType=INTEGER}) delete from `attachment_info` where `type` = #{attachmentType} and `c_id` = #{cId} - + + delete from `attachment_info` where `type` = #{type} and `c_id` = #{cId} and `attachment_name` = #{attachmentName} + + + delete from `attachment_info` where `type` = #{type} and `c_id` = #{cId} and `id` = #{id} @@ -42,7 +46,7 @@ and instr(`type`,#{attachmentType,jdbcType=VARCHAR})>0 - + and instr(`c_id`,#{cId,jdbcType=INTEGER})>0 @@ -51,4 +55,5 @@ select `id`, `attachment_name`, `attachment_url`, `modify_person`, `modify_time`,`type`,`c_id` from `attachment_info` where `type`= #{attachmentType,jdbcType=VARCHAR} and `attachment_name`=#{attachmentName,jdbcType=VARCHAR} + \ No newline at end of file diff --git a/src/main/java/com/soft/line/service/AttachMentInfoService.java b/src/main/java/com/soft/line/service/AttachMentInfoService.java index 57e38a5..deacd88 100644 --- a/src/main/java/com/soft/line/service/AttachMentInfoService.java +++ b/src/main/java/com/soft/line/service/AttachMentInfoService.java @@ -13,5 +13,5 @@ public interface AttachMentInfoService { public void delete(Map map); - public String save(MultipartFile[] uploadFiles,Map map); + public String save(MultipartFile file,String type,Integer cId); } diff --git a/src/main/java/com/soft/line/service/impl/AttachmentInfoServiceImpl.java b/src/main/java/com/soft/line/service/impl/AttachmentInfoServiceImpl.java index 61cdac0..ec49cb4 100644 --- a/src/main/java/com/soft/line/service/impl/AttachmentInfoServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/AttachmentInfoServiceImpl.java @@ -5,66 +5,120 @@ import com.soft.line.mapper.AttachmentInfoMapper; import com.soft.line.service.AttachMentInfoService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.web.server.LocalServerPort; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Map; +import java.io.File; +import java.net.Inet4Address; +import java.net.UnknownHostException; +import java.util.*; @Service @Slf4j public class AttachmentInfoServiceImpl implements AttachMentInfoService { private String[] docTypes = new String[]{ - "DOC","DOCX" ,"XLS","XLSX","PPT","PPTX","PDF" + "DOC", "DOCX", "XLS", "XLSX", "PPT", "PPTX", "PDF" }; private String[] imgTypes = new String[]{ - "JPG","JPEG","PNG","BMP" + "JPG", "JPEG", "PNG", "BMP" }; + /** + * 文件上传路径 例如：D盘下的路径 + */ + @Value(value = "${uploadFileDir}") + private String uploadFileDir; + + @Value("${uploadFileMapping}") + private String uploadFileMappingUrl; + + @Value("${server.port}") + private String port ; + + @Value( "${server.servlet.context-path}") + private String context_path; + + @Autowired private AttachmentInfoMapper attachmentInfoMapper; @Override - public List selectAll(String attachmentType,Integer cId) { - return attachmentInfoMapper.selectAll(attachmentType,cId); + public List selectAll(String attachmentType, Integer cId) { + List list = attachmentInfoMapper.selectAll(attachmentType, cId); + List result = new ArrayList(); + try { + for (AttachmentInfo ainfo : list) { + String pathUrl = ainfo.getAttachmentUrl(); + pathUrl = Inet4Address.getLocalHost().getHostAddress() + ":" + port + context_path + "/" + uploadFileMappingUrl + pathUrl; + ainfo.setAttachmentUrl(pathUrl); + result.add(ainfo); + } + } catch (UnknownHostException e) { + log.error(e.getMessage(), e); + } + return result; } @Override - public void delete(Map map) { - attachmentInfoMapper.deleteFile(map); + public void delete(Map map) { + attachmentInfoMapper.deleteFileMap(map); } @Override - public String save(MultipartFile[] uploadFiles, Map map) { - List samelist = new ArrayList(); - List samelistonly = new ArrayList(); - String warningMsg = ""; - for (MultipartFile file:uploadFiles){ - String fileName = file.getOriginalFilename(); - if(!samelist.contains(fileName)){ - samelist.add(fileName); - }else{ - if (!samelistonly.contains(fileName)) { - samelistonly.add(fileName); - } - } - String contentType=file.getContentType().toUpperCase(); - if(!Arrays.asList(docTypes).contains(contentType)&&!Arrays.asList(imgTypes).contains(contentType)){ - warningMsg += "上传文件格式不正确"; + public String save(MultipartFile file, String type, Integer cId) { + String fileName = file.getOriginalFilename(); + String contentType = fileName.substring(fileName.lastIndexOf(".")+1).toUpperCase(); + String childPath = ""; + if (type.equals("1")) { + childPath = "contract"; + } else if (type.equals("2")) { + childPath = "certificate"; + } + if (!Arrays.asList(docTypes).contains(contentType) && !Arrays.asList(imgTypes).contains(contentType)) { + return "上传文件格式不正确"; + } + + //上传 + File uploadRootFileDir = new File(uploadFileDir); + File fileDir = new File(uploadRootFileDir.getAbsolutePath(), childPath + File.separator + cId); + if (!fileDir.exists()) { + fileDir.mkdirs(); + } + //文件夹中已存在的文件 + File[] existingFiles = fileDir.listFiles(); + + for (File existingFile : existingFiles) { + //文件名一样就先删除 + if (existingFile.getName().equals(fileName)) { + existingFile.delete(); } } - if (samelistonly.size()>0){ - warningMsg += "上传文件中存重复的数据:"+String.join(",", samelistonly); + + File newFile = new File(fileDir.getAbsolutePath(), fileName); + try { + file.transferTo(newFile); + } catch (Exception e) { + e.printStackTrace(); + log.error(e.getMessage(), e); + return "上传文件失败"; } - if (warningMsg.length()>0){ - return warningMsg; - }else{ - //上传 - return "上传成功"; + AttachmentInfo attachmentInfo = new AttachmentInfo(); + attachmentInfo.setAttachmentName(fileName); + attachmentInfo.setAttachmentUrl(childPath+"/" + cId + "/" + fileName); + attachmentInfo.setModifyPerson("admin"); + attachmentInfo.setModifyTime(new Date()); + attachmentInfo.setType(type); + attachmentInfo.setcId(cId); + attachmentInfoMapper.deleteFileRecord(attachmentInfo); + if (attachmentInfoMapper.insert(attachmentInfo)!=1){ + return "文件入库失败，请再次上传"; } + + return "上传成功"; + } } diff --git a/src/main/java/com/soft/line/util/config/ResourceConfigAdapter.java b/src/main/java/com/soft/line/util/config/ResourceConfigAdapter.java deleted file mode 100644 index 45458d2..0000000 --- a/src/main/java/com/soft/line/util/config/ResourceConfigAdapter.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.soft.line.util.config; - -import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.annotation.Configuration; -import org.springframework.stereotype.Component; -import org.springframework.util.ResourceUtils; -import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport; - -import java.io.File; - -/** - * 文件绝对地址与虚拟地址映射 - */ -@Configuration -public class ResourceConfigAdapter extends WebMvcConfigurationSupport { - @Value("${uploadFileDir}") - private String uploadFileDir; - @Value("${uploadFileMapping}") - private String uploadFileMapping; - - @Override - public void addResourceHandlers(ResourceHandlerRegistry registry) { - String os = System.getProperty("os.name"); - if (os.toLowerCase().startsWith("win")) { //如果是Windows系统 - registry.addResourceHandler(uploadFileMapping). - addResourceLocations(ResourceUtils.FILE_URL_PREFIX +uploadFileDir+ File.separator); - }else{//linux和mac系统 - registry.addResourceHandler(uploadFileMapping). - addResourceLocations(ResourceUtils.FILE_URL_PREFIX+"/user/softline-files-manage-uploadFiles/"+ File.separator); - } - registry.addResourceHandler("/**").addResourceLocations( - "classpath:/static/"); - registry.addResourceHandler("swagger-ui.html").addResourceLocations( - "classpath:/META-INF/resources/"); - registry.addResourceHandler("/webjars/**").addResourceLocations( - "classpath:/META-INF/resources/webjars/"); - super.addResourceHandlers(registry); - } -} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 8babf1c..7887311 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,4 +1,4 @@ -server.port=9101 +server.port=9100 server.servlet.context-path=/softline #spring.datasource.url= jdbc:mysql://175.24.112.245:3306/rz_archives?characterEncoding=utf-8&useSSL=false spring.datasource.url= jdbc:mysql://127.0.0.1:3306/rz_archives?characterEncoding=utf-8&useSSL=false -- Gitee From ef9bce67411769e10f0828ca0f0514d3ae605a87 Mon Sep 17 00:00:00 2001 From: ljc Date: Fri, 12 Jun 2020 17:38:56 +0800 Subject: [PATCH 109/211] =?UTF-8?q?=E9=99=84=E4=BB=B6=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/soft/line/util/FileUtil.java | 46 ------------------- 1 file changed, 46 deletions(-) delete mode 100644 src/main/java/com/soft/line/util/FileUtil.java diff --git a/src/main/java/com/soft/line/util/FileUtil.java b/src/main/java/com/soft/line/util/FileUtil.java deleted file mode 100644 index 896ea2d..0000000 --- a/src/main/java/com/soft/line/util/FileUtil.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.soft.line.util; - -import org.springframework.web.multipart.MultipartFile; - -import java.io.File; - -public class FileUtil { - - public static String saveFile(MultipartFile file, String pathname) { - try { - File targetFile = new File(pathname); - if (targetFile.exists()) { - return pathname; - } - - if (!targetFile.getParentFile().exists()) { - targetFile.getParentFile().mkdirs(); - } - file.transferTo(targetFile); - - return pathname; - } catch (Exception e) { - e.printStackTrace(); - } - - return null; - } - - public static boolean deleteFile(String pathname) { - File file = new File(pathname); - if (file.exists()) { - boolean flag = file.delete(); - - if (flag) { - File[] files = file.getParentFile().listFiles(); - if (files == null || files.length == 0) { - file.getParentFile().delete(); - } - } - - return flag; - } - - return false; - } -} -- Gitee From 8c5c8c8e40d9118f88bd233a5c923a03f79f3216 Mon Sep 17 00:00:00 2001 From: wuxueqiao <17625808004@163.com> Date: Mon, 15 Jun 2020 17:19:13 +0800 Subject: [PATCH 110/211] =?UTF-8?q?redis=20=E9=85=8D=E7=BD=AE=E5=92=8C?= =?UTF-8?q?=E5=AF=86=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/soft/line/util/redis/JedisProperties.java | 10 ++++++++++ src/main/resources/application.properties | 4 +++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/soft/line/util/redis/JedisProperties.java b/src/main/java/com/soft/line/util/redis/JedisProperties.java index e2fbee7..297acb4 100644 --- a/src/main/java/com/soft/line/util/redis/JedisProperties.java +++ b/src/main/java/com/soft/line/util/redis/JedisProperties.java @@ -10,6 +10,8 @@ public class JedisProperties { private String host; + private String password; + private int port; private String uri; @@ -20,6 +22,14 @@ public class JedisProperties { private int maxWaitMillis; + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + public String getHost() { return host; } diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index fa5dce4..704c0ce 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -23,9 +23,11 @@ spring.datasource.druid.useGlobalDataSourceStat=true spring.datasource.druid.connectionProperties=druid.stat.mergeSql=true;druid.stat.slowSqlMillis=500 #redisӵַ -spring.jedis.host = 127.0.0.1 +spring.jedis.host = 175.24.112.245 +spring.jedis.password= 123456 spring.jedis.port = 6379 spring.jedis.uri=redis://127.0.0.1:6379/11 + spring.jedis.maxTotal=100 spring.jedis.maxIdle= 10 spring.jedis.maxWaitMillis =100000 -- Gitee From e7824e6dc18bf56a73d0a0aabf1e3eb09da678d2 Mon Sep 17 00:00:00 2001 From: ljc Date: Mon, 15 Jun 2020 17:27:32 +0800 Subject: [PATCH 111/211] =?UTF-8?q?=E8=AF=81=E4=B9=A6=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E8=BF=94=E5=9B=9Eurl?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../line/service/impl/AttachmentInfoServiceImpl.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/soft/line/service/impl/AttachmentInfoServiceImpl.java b/src/main/java/com/soft/line/service/impl/AttachmentInfoServiceImpl.java index ec49cb4..c14c59b 100644 --- a/src/main/java/com/soft/line/service/impl/AttachmentInfoServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/AttachmentInfoServiceImpl.java @@ -116,9 +116,16 @@ public class AttachmentInfoServiceImpl implements AttachMentInfoService { attachmentInfoMapper.deleteFileRecord(attachmentInfo); if (attachmentInfoMapper.insert(attachmentInfo)!=1){ return "文件入库失败，请再次上传"; + }else{ + try { + return Inet4Address.getLocalHost().getHostAddress() + ":" + port + context_path + "/" + uploadFileMappingUrl + attachmentInfo.getAttachmentUrl(); + }catch (UnknownHostException e){ + log.error(e.getMessage(), e); + return "上传失败"; + } } - return "上传成功"; + //return "上传成功"; } } -- Gitee From 6daf839fbca5efe7fb43e8c991b081e783bb07a7 Mon Sep 17 00:00:00 2001 From: wuxueqiao <17625808004@163.com> Date: Tue, 16 Jun 2020 09:08:58 +0800 Subject: [PATCH 112/211] test --- .../java/com/soft/line/controller/LoginController.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/main/java/com/soft/line/controller/LoginController.java b/src/main/java/com/soft/line/controller/LoginController.java index bd0213f..303be06 100644 --- a/src/main/java/com/soft/line/controller/LoginController.java +++ b/src/main/java/com/soft/line/controller/LoginController.java @@ -50,4 +50,11 @@ public class LoginController { public CommonResult getUserInfo(){ return CommonResult.success(loginService.getUserPermission()); } + + @GetMapping("/test") + public CommonResult getStr(){ + return CommonResult.success("abc"); + } } + + -- Gitee From a8d6b56320d21066726d5782b735e03a4f5e63d0 Mon Sep 17 00:00:00 2001 From: wuxueqiao <17625808004@163.com> Date: Tue, 16 Jun 2020 15:21:46 +0800 Subject: [PATCH 113/211] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81?= =?UTF-8?q?=EF=BC=8C=E8=A7=A3=E9=99=A4=E7=BB=91=E5=AE=9A=E7=AD=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../line/controller/MpLoginController.java | 21 +++++++++++++++++++ .../com/soft/line/mapper/UserInfoMapper.java | 4 ++++ .../com/soft/line/mapper/UserInfoMapper.xml | 12 +++++++++++ .../com/soft/line/service/LoginService.java | 4 ++++ .../line/service/impl/LoginServiceImpl.java | 18 ++++++++++++++++ 5 files changed, 59 insertions(+) diff --git a/src/main/java/com/soft/line/controller/MpLoginController.java b/src/main/java/com/soft/line/controller/MpLoginController.java index 4328727..9666628 100644 --- a/src/main/java/com/soft/line/controller/MpLoginController.java +++ b/src/main/java/com/soft/line/controller/MpLoginController.java @@ -3,6 +3,7 @@ package com.soft.line.controller; import com.soft.line.service.LoginService; import com.soft.line.util.MP.AjaxResult; import com.soft.line.util.exception.ResultData; +import io.swagger.models.auth.In; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -39,4 +40,24 @@ public class MpLoginController { public AjaxResult getUserInfo(@RequestBody Map paraMap) { return loginService.getUserInfo(paraMap); } + + /** + * 修改密码 + * @param paraMap + * @return + */ + @PostMapping("/updatePassword") + public AjaxResult updatePassword(@RequestBody Map paraMap){ + return loginService.updatePassword(paraMap); + } + + /** + * 解除绑定 + * @param paraMap + * @return + */ + @PostMapping("/deleteOpenId") + public AjaxResult deleteOpenId(@RequestBody Map paraMap){ + return loginService.deleteOpenId(Integer.valueOf(paraMap.get("id").toString())); + } } diff --git a/src/main/java/com/soft/line/mapper/UserInfoMapper.java b/src/main/java/com/soft/line/mapper/UserInfoMapper.java index d8720bd..d6f0efa 100644 --- a/src/main/java/com/soft/line/mapper/UserInfoMapper.java +++ b/src/main/java/com/soft/line/mapper/UserInfoMapper.java @@ -81,4 +81,8 @@ public interface UserInfoMapper { * @return */ int updateOpenIdById(String openId, int id); + + int updatePassword(Map map); + + int deleteOpenId(int id); } \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/UserInfoMapper.xml b/src/main/java/com/soft/line/mapper/UserInfoMapper.xml index 237dd9a..6da14cd 100644 --- a/src/main/java/com/soft/line/mapper/UserInfoMapper.xml +++ b/src/main/java/com/soft/line/mapper/UserInfoMapper.xml @@ -123,4 +123,16 @@ WHERE `id`=#{id,jdbcType=INTEGER} + + UPDATE `user_info` + SET `password`=#{password,jdbcType=VARCHAR} + WHERE `id`=#{id,jdbcType=INTEGER} + + + + UPDATE `user_info` + SET `openId`='' + WHERE `id`=#{id,jdbcType=INTEGER} + + \ No newline at end of file diff --git a/src/main/java/com/soft/line/service/LoginService.java b/src/main/java/com/soft/line/service/LoginService.java index 476b9ca..0eeb27d 100644 --- a/src/main/java/com/soft/line/service/LoginService.java +++ b/src/main/java/com/soft/line/service/LoginService.java @@ -24,5 +24,9 @@ public interface LoginService { AjaxResult getUserInfo(Map map); + AjaxResult updatePassword(Map map); + + AjaxResult deleteOpenId(int id); + UserPermission getUserPermission(); } diff --git a/src/main/java/com/soft/line/service/impl/LoginServiceImpl.java b/src/main/java/com/soft/line/service/impl/LoginServiceImpl.java index c48d041..d2b04f3 100644 --- a/src/main/java/com/soft/line/service/impl/LoginServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/LoginServiceImpl.java @@ -213,6 +213,24 @@ public class LoginServiceImpl implements LoginService { return AjaxResult.error(); } + @Override + public AjaxResult updatePassword(Map map) { + int result=userInfoMapper.updatePassword(map); + if(result>0){ + return AjaxResult.success(); + } + return AjaxResult.error(); + } + + @Override + public AjaxResult deleteOpenId(int id) { + int result=userInfoMapper.deleteOpenId(id); + if(result>0){ + return AjaxResult.success(); + } + return AjaxResult.error(); + } + @Override public UserPermission getUserPermission() { UserTokenDto userTokenDto=HttpRequestUtil.getUserToken(); -- Gitee From af06ca6c14975494447b70e6ea130123c81bf814 Mon Sep 17 00:00:00 2001 From: wuxueqiao <17625808004@163.com> Date: Tue, 16 Jun 2020 16:52:13 +0800 Subject: [PATCH 114/211] =?UTF-8?q?=E5=AE=9E=E4=BD=93=E7=B1=BB=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 7 +- softline-files-manage.iml | 1 + .../controller/CertificateInfoController.java | 17 +- .../controller/ContractInfoController.java | 20 +- .../line/controller/MenuInfoController.java | 50 -- .../line/controller/RoleInfoController.java | 4 +- .../line/controller/UserInfoController.java | 3 +- .../com/soft/line/entity/CertificateInfo.java | 126 +---- .../com/soft/line/entity/ContractInfo.java | 523 ++---------------- .../java/com/soft/line/entity/MenuInfo.java | 288 +--------- .../java/com/soft/line/entity/RoleInfo.java | 52 +- .../java/com/soft/line/entity/UserInfo.java | 88 +-- .../line/mapper/CertificateInfoMapper.java | 4 +- .../line/mapper/CertificateInfoMapper.xml | 4 +- .../soft/line/mapper/ContractInfoMapper.java | 4 +- .../soft/line/mapper/ContractInfoMapper.xml | 4 +- .../line/service/CertificateInfoService.java | 4 +- .../line/service/ContractInfoService.java | 4 +- .../impl/CertificateInfoServiceImpl.java | 14 +- .../service/impl/ContractInfoServiceImpl.java | 14 +- src/main/resources/application.properties | 4 +- 21 files changed, 179 insertions(+), 1056 deletions(-) diff --git a/pom.xml b/pom.xml index d003a0c..3a8a8a3 100644 --- a/pom.xml +++ b/pom.xml @@ -194,7 +194,12 @@ httpclient 4.5.10 - + + + javax.validation + validation-api + 1.1.0.Final + diff --git a/softline-files-manage.iml b/softline-files-manage.iml index 70459be..e2737a6 100644 --- a/softline-files-manage.iml +++ b/softline-files-manage.iml @@ -155,5 +155,6 @@ + \ No newline at end of file diff --git a/src/main/java/com/soft/line/controller/CertificateInfoController.java b/src/main/java/com/soft/line/controller/CertificateInfoController.java index 7cd4846..f6d205c 100644 --- a/src/main/java/com/soft/line/controller/CertificateInfoController.java +++ b/src/main/java/com/soft/line/controller/CertificateInfoController.java @@ -19,6 +19,7 @@ import org.apache.poi.ss.usermodel.Sheet; import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -81,22 +82,22 @@ public class CertificateInfoController { @ApiOperation(value = "保存证书", notes = "保存证书") @PostMapping("/certificate") - public CommonResult saveCertificate(@RequestBody Map map) { - if (certificateInfoService.countByCId((Integer) map.get("id"), (String) map.get("certId")) > 0) { + public CommonResult saveCertificate(@RequestBody @Validated CertificateInfo certificateInfo) { + if (certificateInfoService.countByCId(certificateInfo.getId(), certificateInfo.getCertId()) > 0) { return CommonResult.success("存在相同证书编号"); } - Date beginDate = StringToDateUtil.convert((String) map.get("beginDate")); - Date endDate = StringToDateUtil.convert((String) map.get("endDate")); + Date beginDate = StringToDateUtil.convert(certificateInfo.getBeginDate().toString()); + Date endDate = StringToDateUtil.convert(certificateInfo.getEndDate().toString()); if (beginDate.after(endDate)) { - return CommonResult.success("起始日期不能>终止日期"); + return CommonResult.failed("起始日期不能>终止日期"); } - if ((Integer) map.get("id") == null) { + if (certificateInfo.getId() == null) { //添加 - certificateInfoService.add(map); + certificateInfoService.add(certificateInfo); return CommonResult.success("添加成功"); } else { //修改 - certificateInfoService.update(map); + certificateInfoService.update(certificateInfo); return CommonResult.success("修改成功"); } } diff --git a/src/main/java/com/soft/line/controller/ContractInfoController.java b/src/main/java/com/soft/line/controller/ContractInfoController.java index 5f2686c..c425925 100644 --- a/src/main/java/com/soft/line/controller/ContractInfoController.java +++ b/src/main/java/com/soft/line/controller/ContractInfoController.java @@ -10,6 +10,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -55,27 +56,24 @@ public class ContractInfoController { @ApiOperation(value = "保存合同", notes = "保存合同") @PostMapping("/contract") - public CommonResult saveContract(@RequestBody Map map){ - if (contractInfoService.countContractByIdAndName((Integer)map.get("id"),(String)map.get("contractName"))>0){ + public CommonResult saveContract(@RequestBody @Validated ContractInfo contractInfo){ + if (contractInfoService.countContractByIdAndName(contractInfo.getId(),contractInfo.getContractName())>0){ return CommonResult.success("存在相同合同名称"); } - /*if (!isDouble((String)map.get("totalAmount"))){ - return new ResultData(200,"总金额不是数字类型",null); - }*/ - Date signDate = StringToDateUtil.convert((String)map.get("signTime")); - Date beginDate = StringToDateUtil.convert((String)map.get("beginDate")); - Date endDate =StringToDateUtil.convert((String)map.get("endDate")); + + Date beginDate = StringToDateUtil.convert(contractInfo.getBeginDate().toString()); + Date endDate =StringToDateUtil.convert(contractInfo.getEndDate().toString()); if (beginDate.after(endDate)){ return CommonResult.success("起始日期不能>终止日期"); } - if ((Integer)map.get("id")==null){ + if (contractInfo.getId()==null){ //添加 - contractInfoService.add(map); + contractInfoService.add(contractInfo); return CommonResult.success("添加成功"); }else{ //修改 - contractInfoService.update(map); + contractInfoService.update(contractInfo); return CommonResult.success("修改成功"); } } diff --git a/src/main/java/com/soft/line/controller/MenuInfoController.java b/src/main/java/com/soft/line/controller/MenuInfoController.java index 7468fe3..4e7e827 100644 --- a/src/main/java/com/soft/line/controller/MenuInfoController.java +++ b/src/main/java/com/soft/line/controller/MenuInfoController.java @@ -114,54 +114,4 @@ public class MenuInfoController { } - /*@ApiOperation(value = "修改菜单") - @PutMapping("/menu") - public ResultData editMenu(@RequestBody Map map) { - MenuInfo menuInfo = new MenuInfo(); - menuInfo.setId((Integer) map.get("id")); - if (map.get("menuName")==null){ - return new ResultData(200,"菜单名称不能为空",null); - }else{ - //新增时判断menuName是否重复 - menuInfo.setMenuName(map.get("menuName").toString()); - if (menuInfoService.countMenuName(menuInfo.getId(),menuInfo.getMenuName())>0){ - return new ResultData(200,"菜单名称已存在",null); - } - } - - menuInfo.setMenuIcon(map.get("menuIcon")==null?"":map.get("menuIcon").toString()); - menuInfo.setMenuUrl(map.get("menuUrl")==null?"":map.get("menuUrl").toString()); - if (map.get("orderBy")==null){ - return new ResultData(200,"菜单排序不能为空",null); - }else{ - menuInfo.setOrderBy(map.get("orderBy")==null?"":map.get("orderBy").toString()); - if (menuInfoService.countOrderBy(menuInfo.getId(),menuInfo.getOrderBy())>0){ - return new ResultData(200,"菜单排序已存在",null); - } - } - - //判断父级菜单是否存在 - menuInfo.setpId((Integer) map.get("pId")); - if (menuInfo.getpId()==-1){ - menuInfo.setState(1); - }else { - MenuInfo pMenu = menuInfoService.selectParentMenu(menuInfo.getpId()); - if (pMenu==null){ - return new ResultData(200,"父级菜单不存在",null); - } - menuInfo.setState(pMenu.getState()+1); - } - - menuInfo.setModifyTime(new Date()); - menuInfo.setModifyPerson("admin"); - List buttonInfos =new ArrayList(); - for (String buttonId : (List)map.get("buttonList")){ - ButtonInfo buttonInfo = buttonInfoService.selectByButtonId(buttonId); - buttonInfos.add(buttonInfo); - } - menuInfo.setButtonInfoList(buttonInfos); - menuInfoService.updateMenInfo(menuInfo); - return new ResultData(200,"修改菜单成功",null); - }*/ - } diff --git a/src/main/java/com/soft/line/controller/RoleInfoController.java b/src/main/java/com/soft/line/controller/RoleInfoController.java index 2717823..c71d9ca 100644 --- a/src/main/java/com/soft/line/controller/RoleInfoController.java +++ b/src/main/java/com/soft/line/controller/RoleInfoController.java @@ -37,12 +37,12 @@ public class RoleInfoController { @PostMapping("/role") @ApiOperation(value = "保存角色") public CommonResult saveRole(@RequestBody Map map) { - if ((String)map.get("roleName")==null||"".equals((String)map.get("roleName"))){ + if (map.get("roleName")==null||"".equals(map.get("roleName"))){ return CommonResult.success("角色名称不能为空"); }else if(roleInfoService.countRoleName((Integer)map.get("id"),(String)map.get("roleName")) > 0){ return CommonResult.success("角色名称已存在"); } - if ((Integer)map.get("id")==null){ + if (map.get("id")==null){ //添加 roleInfoService.add(map); return CommonResult.success("添加成功"); diff --git a/src/main/java/com/soft/line/controller/UserInfoController.java b/src/main/java/com/soft/line/controller/UserInfoController.java index 67905a3..895fbcd 100644 --- a/src/main/java/com/soft/line/controller/UserInfoController.java +++ b/src/main/java/com/soft/line/controller/UserInfoController.java @@ -9,6 +9,7 @@ import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import java.util.Map; @@ -36,7 +37,7 @@ public class UserInfoController { @ApiImplicitParam(paramType = "query", name = "userInfo", value = "账号", required = false, dataType = "com.soft.line.entity.UserInfo"), }) @PostMapping("/account") - public CommonResult addUser(@RequestBody UserInfo userInfo){ + public CommonResult addUser(@RequestBody @Validated UserInfo userInfo){ int result=userInfoService.addUser(userInfo); if(result==1){ return CommonResult.success("保存成功"); diff --git a/src/main/java/com/soft/line/entity/CertificateInfo.java b/src/main/java/com/soft/line/entity/CertificateInfo.java index 9585a5d..82737b6 100644 --- a/src/main/java/com/soft/line/entity/CertificateInfo.java +++ b/src/main/java/com/soft/line/entity/CertificateInfo.java @@ -2,36 +2,58 @@ package com.soft.line.entity; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonInclude; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.hibernate.validator.constraints.Length; import javax.validation.constraints.NotNull; import java.util.Date; -//@JsonInclude(JsonInclude.Include.NON_NULL) +@Data +@NoArgsConstructor +@AllArgsConstructor public class CertificateInfo { private Integer id; - @NotNull + @ApiModelProperty(value = "证书ID") + @NotNull(message = "证书ID不能为空") + @Length(max = 200,message="证书ID不能大于200位") private String certId; - @NotNull + @ApiModelProperty(value = "证书类型") + @NotNull(message = "证书类型不能为空") private String certType; - @NotNull + @ApiModelProperty(value = "证书名称") + @NotNull(message = "证书名称不能为空") + @Length(max = 200,message="证书名称不能大于200位") + private String certName; + @ApiModelProperty(value = "项目名称") + @NotNull(message = "项目名称不能为空") + @Length(max = 200,message="项目名称不能大于200位") private String projectName; - @NotNull + @ApiModelProperty(value = "颁奖单位") + @NotNull(message = "颁奖单位不能为空") + @Length(max = 200,message="颁奖单位不能大于200位") private String certUnit; - @NotNull + @ApiModelProperty(value = "发证日期") + @NotNull(message = "发证日期不能为空") @JsonFormat(pattern = "yyyy-MM-dd",timezone = "Asia/Shanghai") private Date beginDate; + @ApiModelProperty(value = "到期日期") + @NotNull(message = "到期日期不能为空") @JsonFormat(pattern = "yyyy-MM-dd",timezone = "Asia/Shanghai") private Date endDate; + @Length(max = 200,message="备注不能大于200位") private String note; private String modifyPerson; @@ -39,97 +61,5 @@ public class CertificateInfo { @JsonFormat(pattern = "yyyy-MM-dd",timezone = "Asia/Shanghai") private Date modifyTime; - private String delFlg; - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public String getCertId() { - return certId; - } - - public void setCertId(String certId) { - this.certId = certId == null ? null : certId.trim(); - } - - public String getCertType() { - return certType; - } - - public void setCertType(String certType) { - this.certType = certType == null ? null : certType.trim(); - } - - public String getCertName() { - return certName; - } - - public void setCertName(String certName) { - this.certName = certName == null ? null : certName.trim(); - } - - public String getProjectName() { return projectName; } - - public void setProjectName(String projectName) { this.projectName = projectName == null ? null : projectName.trim(); } - - public String getCertUnit() { - return certUnit; - } - - public void setCertUnit(String certUnit) { - this.certUnit = certUnit == null ? null : certUnit.trim(); - } - - public Date getBeginDate() { - return beginDate; - } - - public void setBeginDate(Date beginDate) { - this.beginDate = beginDate; - } - - public Date getEndDate() { - return endDate; - } - - public void setEndDate(Date endDate) { - this.endDate = endDate; - } - - public String getNote() { - return note; - } - - public void setNote(String note) { - this.note = note == null ? null : note.trim(); - } - - public String getModifyPerson() { - return modifyPerson; - } - - public void setModifyPerson(String modifyPerson) { - this.modifyPerson = modifyPerson == null ? null : modifyPerson.trim(); - } - - public Date getModifyTime() { - return modifyTime; - } - - public void setModifyTime(Date modifyTime) { - this.modifyTime = modifyTime; - } - - public String getDelFlg() { - return delFlg; - } - public void setDelFlg(String delFlg) { - this.delFlg = delFlg == null ? null : delFlg.trim(); - } } \ No newline at end of file diff --git a/src/main/java/com/soft/line/entity/ContractInfo.java b/src/main/java/com/soft/line/entity/ContractInfo.java index 66a0c08..b3c5330 100644 --- a/src/main/java/com/soft/line/entity/ContractInfo.java +++ b/src/main/java/com/soft/line/entity/ContractInfo.java @@ -1,524 +1,87 @@ package com.soft.line.entity; import com.fasterxml.jackson.annotation.JsonFormat; - +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.hibernate.validator.constraints.Length; + +import javax.validation.constraints.DecimalMin; +import javax.validation.constraints.Digits; +import javax.validation.constraints.Min; +import javax.validation.constraints.NotNull; import java.math.BigDecimal; import java.util.Date; +@Data +@NoArgsConstructor +@AllArgsConstructor public class ContractInfo { - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column contract_info.id - * - * @mbggenerated - */ + private Integer id; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column contract_info.dep_id - * - * @mbggenerated - */ + @ApiModelProperty(value = "部门ID") + @NotNull(message = "部门不能为空") private String depId; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column contract_info.contract_name - * - * @mbggenerated - */ + @ApiModelProperty(value = "合同名称") + @NotNull(message = "合同名称不能为空") + @Length(max = 200,message="合同名称不能大于200位") private String contractName; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column contract_info.pro_id - * - * @mbggenerated - */ + @ApiModelProperty(value = "部门ID") + @NotNull(message = "部门不能为空") private String proId; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column contract_info.total amount - * - * @mbggenerated - */ + @ApiModelProperty(value = "总金额") + @NotNull(message = "总金额不能为空") + @DecimalMin("10000") private BigDecimal totalAmount; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column contract_info.part_a - * - * @mbggenerated - */ + @ApiModelProperty(value = "第一签约方") + @NotNull(message = "第一签约方不能为空") + @Length(max = 200,message="第一签约方不能大于200位") private String partA; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column contract_info.part_b - * - * @mbggenerated - */ + @ApiModelProperty(value = "第二签约方") + @NotNull(message = "第二签约方不能为空") + @Length(max = 200,message="第二签约方不能大于200位") private String partB; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column contract_info.sign_time - * - * @mbggenerated - */ + @ApiModelProperty(value = "签约日期") + @NotNull(message = "签约日期不能为空") @JsonFormat(pattern = "yyyy-MM-dd",timezone = "Asia/Shanghai") private Date signTime; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column contract_info.sign_addr - * - * @mbggenerated - */ + @ApiModelProperty(value = "签约地点") + @NotNull(message = "签约地点不能为空") + @Length(max = 200,message="签约地点不能大于200位") private String signAddr; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column contract_info.begin_date - * - * @mbggenerated - */ + @ApiModelProperty(value = "开始时间") + @NotNull(message = "开始时间不能为空") @JsonFormat(pattern = "yyyy-MM-dd",timezone = "Asia/Shanghai") private Date beginDate; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column contract_info.end_date - * - * @mbggenerated - */ + @ApiModelProperty(value = "结束时间") + @NotNull(message = "结束时间不能为空") @JsonFormat(pattern = "yyyy-MM-dd",timezone = "Asia/Shanghai") private Date endDate; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column contract_info.payment - * - * @mbggenerated - */ + @ApiModelProperty(value = "支付方式") + @NotNull(message = "支付方式不能为空") private String payment; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column contract_info.note - * - * @mbggenerated - */ + @ApiModelProperty(value = "备注") + @Length(max = 200,message="备注不能大于200位") private String note; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column contract_info.modify_person - * - * @mbggenerated - */ private String modifyPerson; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column contract_info.modify_time - * - * @mbggenerated - */ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "Asia/Shanghai") private Date modifyTime; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column contract_info.del_flg - * - * @mbggenerated - */ private String delFlg; - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column contract_info.id - * - * @return the value of contract_info.id - * - * @mbggenerated - */ - public Integer getId() { - return id; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column contract_info.id - * - * @param id the value for contract_info.id - * - * @mbggenerated - */ - public void setId(Integer id) { - this.id = id; - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column contract_info.dep_id - * - * @return the value of contract_info.dep_id - * - * @mbggenerated - */ - public String getDepId() { - return depId; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column contract_info.dep_id - * - * @param depId the value for contract_info.dep_id - * - * @mbggenerated - */ - public void setDepId(String depId) { - this.depId = depId == null ? null : depId.trim(); - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column contract_info.contract_name - * - * @return the value of contract_info.contract_name - * - * @mbggenerated - */ - public String getContractName() { - return contractName; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column contract_info.contract_name - * - * @param contractName the value for contract_info.contract_name - * - * @mbggenerated - */ - public void setContractName(String contractName) { - this.contractName = contractName == null ? null : contractName.trim(); - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column contract_info.pro_id - * - * @return the value of contract_info.pro_id - * - * @mbggenerated - */ - public String getProId() { - return proId; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column contract_info.pro_id - * - * @param proId the value for contract_info.pro_id - * - * @mbggenerated - */ - public void setProId(String proId) { - this.proId = proId == null ? null : proId.trim(); - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column contract_info.total amount - * - * @return the value of contract_info.total amount - * - * @mbggenerated - */ - public BigDecimal getTotalAmount() { - return totalAmount; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column contract_info.total amount - * - * @param totalAmount the value for contract_info.total amount - * - * @mbggenerated - */ - public void setTotalAmount(BigDecimal totalAmount) { - this.totalAmount = totalAmount; - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column contract_info.part_a - * - * @return the value of contract_info.part_a - * - * @mbggenerated - */ - public String getPartA() { - return partA; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column contract_info.part_a - * - * @param partA the value for contract_info.part_a - * - * @mbggenerated - */ - public void setPartA(String partA) { - this.partA = partA == null ? null : partA.trim(); - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column contract_info.part_b - * - * @return the value of contract_info.part_b - * - * @mbggenerated - */ - public String getPartB() { - return partB; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column contract_info.part_b - * - * @param partB the value for contract_info.part_b - * - * @mbggenerated - */ - public void setPartB(String partB) { - this.partB = partB == null ? null : partB.trim(); - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column contract_info.sign_time - * - * @return the value of contract_info.sign_time - * - * @mbggenerated - */ - public Date getSignTime() { - return signTime; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column contract_info.sign_time - * - * @param signTime the value for contract_info.sign_time - * - * @mbggenerated - */ - public void setSignTime(Date signTime) { - this.signTime = signTime; - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column contract_info.sign_addr - * - * @return the value of contract_info.sign_addr - * - * @mbggenerated - */ - public String getSignAddr() { - return signAddr; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column contract_info.sign_addr - * - * @param signAddr the value for contract_info.sign_addr - * - * @mbggenerated - */ - public void setSignAddr(String signAddr) { - this.signAddr = signAddr == null ? null : signAddr.trim(); - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column contract_info.begin_date - * - * @return the value of contract_info.begin_date - * - * @mbggenerated - */ - public Date getBeginDate() { - return beginDate; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column contract_info.begin_date - * - * @param beginDate the value for contract_info.begin_date - * - * @mbggenerated - */ - public void setBeginDate(Date beginDate) { - this.beginDate = beginDate; - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column contract_info.end_date - * - * @return the value of contract_info.end_date - * - * @mbggenerated - */ - public Date getEndDate() { - return endDate; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column contract_info.end_date - * - * @param endDate the value for contract_info.end_date - * - * @mbggenerated - */ - public void setEndDate(Date endDate) { - this.endDate = endDate; - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column contract_info.payment - * - * @return the value of contract_info.payment - * - * @mbggenerated - */ - public String getPayment() { - return payment; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column contract_info.payment - * - * @param payment the value for contract_info.payment - * - * @mbggenerated - */ - public void setPayment(String payment) { - this.payment = payment == null ? null : payment.trim(); - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column contract_info.note - * - * @return the value of contract_info.note - * - * @mbggenerated - */ - public String getNote() { - return note; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column contract_info.note - * - * @param note the value for contract_info.note - * - * @mbggenerated - */ - public void setNote(String note) { - this.note = note == null ? null : note.trim(); - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column contract_info.modify_person - * - * @return the value of contract_info.modify_person - * - * @mbggenerated - */ - public String getModifyPerson() { - return modifyPerson; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column contract_info.modify_person - * - * @param modifyPerson the value for contract_info.modify_person - * - * @mbggenerated - */ - public void setModifyPerson(String modifyPerson) { - this.modifyPerson = modifyPerson == null ? null : modifyPerson.trim(); - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column contract_info.modify_time - * - * @return the value of contract_info.modify_time - * - * @mbggenerated - */ - public Date getModifyTime() { - return modifyTime; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column contract_info.modify_time - * - * @param modifyTime the value for contract_info.modify_time - * - * @mbggenerated - */ - public void setModifyTime(Date modifyTime) { - this.modifyTime = modifyTime; - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column contract_info.del_flg - * - * @return the value of contract_info.del_flg - * - * @mbggenerated - */ - public String getDelFlg() { - return delFlg; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column contract_info.del_flg - * - * @param delFlg the value for contract_info.del_flg - * - * @mbggenerated - */ - public void setDelFlg(String delFlg) { - this.delFlg = delFlg == null ? null : delFlg.trim(); - } } \ No newline at end of file diff --git a/src/main/java/com/soft/line/entity/MenuInfo.java b/src/main/java/com/soft/line/entity/MenuInfo.java index 81ca2ce..ddd7cf8 100644 --- a/src/main/java/com/soft/line/entity/MenuInfo.java +++ b/src/main/java/com/soft/line/entity/MenuInfo.java @@ -1,307 +1,55 @@ package com.soft.line.entity; import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.hibernate.validator.constraints.Length; +import javax.validation.constraints.NotNull; import java.util.Date; import java.util.List; +@Data +@NoArgsConstructor +@AllArgsConstructor public class MenuInfo { - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column menu_info.id - * - * @mbggenerated - */ + private Integer id; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column menu_info.menu_icon - * - * @mbggenerated - */ private String menuIcon; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column menu_info.menu_name - * - * @mbggenerated - */ + @ApiModelProperty(value = "菜单名") + @NotNull(message = "菜单名不能为空") + @Length(min=4,max = 20,message="菜单名称长度不能小于4位，且不能大于20位") private String menuName; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column menu_info.state - * - * @mbggenerated - */ private Integer state; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column menu_info.menu_url - * - * @mbggenerated - */ + @ApiModelProperty(value = "菜单路径") + @NotNull(message = "菜单路径不能为空") + @Length(max =255,message="菜单路径长度不能小于4位，且不能大于20位") private String menuUrl; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column menu_info.oredby - * - * @mbggenerated - */ + @ApiModelProperty(value = "菜单排序") + @NotNull(message = "菜单排序不能为空") private String orderBy; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column menu_info.p_id - * - * @mbggenerated - */ private Integer pId; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column menu_info.modify_person - * - * @mbggenerated - */ private String modifyPerson; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column menu_info.modify_time - * - * @mbggenerated - */ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "Asia/Shanghai") private Date modifyTime; private List buttonInfoList; - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column menu_info.id - * - * @return the value of menu_info.id - * - * @mbggenerated - */ - public Integer getId() { - return id; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column menu_info.id - * - * @param id the value for menu_info.id - * - * @mbggenerated - */ - public void setId(Integer id) { - this.id = id; - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column menu_info.menu_icon - * - * @return the value of menu_info.menu_icon - * - * @mbggenerated - */ - public String getMenuIcon() { - return menuIcon; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column menu_info.menu_icon - * - * @param menuIcon the value for menu_info.menu_icon - * - * @mbggenerated - */ - public void setMenuIcon(String menuIcon) { - this.menuIcon = menuIcon == null ? null : menuIcon.trim(); - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column menu_info.menu_name - * - * @return the value of menu_info.menu_name - * - * @mbggenerated - */ - public String getMenuName() { - return menuName; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column menu_info.menu_name - * - * @param menuName the value for menu_info.menu_name - * - * @mbggenerated - */ - public void setMenuName(String menuName) { - this.menuName = menuName == null ? null : menuName.trim(); - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column menu_info.state - * - * @return the value of menu_info.state - * - * @mbggenerated - */ - public Integer getState() { - return state; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column menu_info.state - * - * @param state the value for menu_info.state - * - * @mbggenerated - */ - public void setState(Integer state) { - this.state = state; - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column menu_info.menu_url - * - * @return the value of menu_info.menu_url - * - * @mbggenerated - */ - public String getMenuUrl() { - return menuUrl; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column menu_info.menu_url - * - * @param menuUrl the value for menu_info.menu_url - * - * @mbggenerated - */ - public void setMenuUrl(String menuUrl) { - this.menuUrl = menuUrl == null ? null : menuUrl.trim(); - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column menu_info.oredby - * - * @return the value of menu_info.oredby - * - * @mbggenerated - */ - public String getOrderBy() { - return orderBy; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column menu_info.orderby - * - * @param orderBy the value for menu_info.orderby - * - * @mbggenerated - */ - public void setOrderBy(String orderBy) { - this.orderBy = orderBy == null ? null : orderBy.trim(); - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column menu_info.p_id - * - * @return the value of menu_info.p_id - * - * @mbggenerated - */ public Integer getpId() { return pId; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column menu_info.p_id - * - * @param pId the value for menu_info.p_id - * - * @mbggenerated - */ public void setpId(Integer pId) { this.pId = pId; } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column menu_info.modify_person - * - * @return the value of menu_info.modify_person - * - * @mbggenerated - */ - public String getModifyPerson() { - return modifyPerson; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column menu_info.modify_person - * - * @param modifyPerson the value for menu_info.modify_person - * - * @mbggenerated - */ - public void setModifyPerson(String modifyPerson) { - this.modifyPerson = modifyPerson == null ? null : modifyPerson.trim(); - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column menu_info.modify_time - * - * @return the value of menu_info.modify_time - * - * @mbggenerated - */ - public Date getModifyTime() { - return modifyTime; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column menu_info.modify_time - * - * @param modifyTime the value for menu_info.modify_time - * - * @mbggenerated - */ - public void setModifyTime(Date modifyTime) { - this.modifyTime = modifyTime; - } - - public List getButtonInfoList() { - return buttonInfoList; - } - - public void setButtonInfoList(List buttonInfoList) { - this.buttonInfoList = buttonInfoList; - } } \ No newline at end of file diff --git a/src/main/java/com/soft/line/entity/RoleInfo.java b/src/main/java/com/soft/line/entity/RoleInfo.java index ff17731..2d6bff2 100644 --- a/src/main/java/com/soft/line/entity/RoleInfo.java +++ b/src/main/java/com/soft/line/entity/RoleInfo.java @@ -1,15 +1,26 @@ package com.soft.line.entity; import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.hibernate.validator.constraints.Length; +import javax.validation.constraints.NotNull; import java.util.Date; +@Data +@NoArgsConstructor +@AllArgsConstructor public class RoleInfo { private Integer id; + @NotNull(message = "角色名称不能为空") + @Length(min=2,max=20,message="角色名称不能小于2位,且不能大于20位") private String name; + @NotNull(message = "角色状态不能为空") private String state; private String modifyPerson; @@ -17,45 +28,4 @@ public class RoleInfo { @JsonFormat(pattern = "yyyy-MM-dd",timezone = "Asia/Shanghai") private Date modifyTime; - - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name == null ? null : name.trim(); - } - - public String getState() { - return state; - } - - public void setState(String state) { - this.state = state ; - } - - public String getModifyPerson() { - return modifyPerson; - } - - public void setModifyPerson(String modifyPerson) { - this.modifyPerson = modifyPerson; - } - - public Date getModifyTime() { - return modifyTime; - } - - public void setModifyTime(Date modifyTime) { - this.modifyTime = modifyTime; - } } \ No newline at end of file diff --git a/src/main/java/com/soft/line/entity/UserInfo.java b/src/main/java/com/soft/line/entity/UserInfo.java index 876041b..ca6a4cd 100644 --- a/src/main/java/com/soft/line/entity/UserInfo.java +++ b/src/main/java/com/soft/line/entity/UserInfo.java @@ -1,97 +1,53 @@ package com.soft.line.entity; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; +import org.hibernate.validator.constraints.Length; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Pattern; import java.util.Date; @Data +@NoArgsConstructor +@AllArgsConstructor public class UserInfo { - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column user_info.id - * - * @mbggenerated - */ + private Integer id; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column user_info.user_name - * - * @mbggenerated - */ + @ApiModelProperty(value = "用户名") + @NotNull(message = "用户名不能为空") + @Length(min=4,max = 20,message="用户名长度不能小于4位，且不能大于20位") private String userName; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column user_info.password - * - * @mbggenerated - */ + @ApiModelProperty(value = "密码") + @NotNull(message = "密码不能为空") + @Length(min=6,max=32,message="密码长度不能小于6位,且不能大于32位") private String password; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column user_info.phone - * - * @mbggenerated - */ + @ApiModelProperty(value = "电话") + @NotNull(message = "电话不能为空") + @Pattern(regexp = "1[3|4|5|7|8][0-9]\\d{8}") private String phone; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column user_info.modify_person - * - * @mbggenerated - */ private String modifyPerson; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column user_info.modify_time - * - * @mbggenerated - */ private Date modifyTime; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column user_info.head_img_url - * - * @mbggenerated - */ private String headImgUrl; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column user_info.user_status - * - * @mbggenerated - */ + @ApiModelProperty(value = "状态") + @NotNull(message = "状态不能为空") private String userStatus; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column user_info.role_id - * - * @mbggenerated - */ + @ApiModelProperty(value = "角色") + @NotNull(message = "角色不能为空") private Integer roleId; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column user_info.salt - * - * @mbggenerated - */ private String salt; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column user_info.open_id - * - * @mbggenerated - */ private String openId; diff --git a/src/main/java/com/soft/line/mapper/CertificateInfoMapper.java b/src/main/java/com/soft/line/mapper/CertificateInfoMapper.java index 616ace4..78d4b99 100644 --- a/src/main/java/com/soft/line/mapper/CertificateInfoMapper.java +++ b/src/main/java/com/soft/line/mapper/CertificateInfoMapper.java @@ -10,13 +10,13 @@ import java.util.Map; @Mapper public interface CertificateInfoMapper { - int insert(Map map); + int insert(CertificateInfo certificateInfo); int insertRecord(CertificateInfo record); int delete(Map map); - int update(Map map); + int update(CertificateInfo certificateInfo); CertificateInfo selectByPrimaryKey(Long id); diff --git a/src/main/java/com/soft/line/mapper/CertificateInfoMapper.xml b/src/main/java/com/soft/line/mapper/CertificateInfoMapper.xml index e441e60..eb3a1c2 100644 --- a/src/main/java/com/soft/line/mapper/CertificateInfoMapper.xml +++ b/src/main/java/com/soft/line/mapper/CertificateInfoMapper.xml @@ -19,7 +19,7 @@ - + insert into `certificate_info` (`cert_id`, `cert_type`, `cert_name`, `project_name`,`cert_unit`, `begin_date`, `end_date`, `note`, `modify_person`) @@ -41,7 +41,7 @@ update `certificate_info` set `del_flg` = '1' where `id` = #{id,jdbcType=INTEGER} - + update `certificate_info` set `cert_id` = #{certId,jdbcType=VARCHAR}, `cert_type` = #{certType,jdbcType=VARCHAR}, `cert_name` = #{certName,jdbcType=VARCHAR}, diff --git a/src/main/java/com/soft/line/mapper/ContractInfoMapper.java b/src/main/java/com/soft/line/mapper/ContractInfoMapper.java index a3e4158..876a344 100644 --- a/src/main/java/com/soft/line/mapper/ContractInfoMapper.java +++ b/src/main/java/com/soft/line/mapper/ContractInfoMapper.java @@ -13,13 +13,13 @@ public interface ContractInfoMapper { * * @mbggenerated */ - int insert(Map map); + int insert(ContractInfo contractInfo); int insertRecord(ContractInfo record); int delete(Map map); - int update(Map map); + int update(ContractInfo contractInfo); /** * This method was generated by MyBatis Generator. diff --git a/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml b/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml index 9e5619e..2af3e45 100644 --- a/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml +++ b/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml @@ -24,7 +24,7 @@ - + insert into `contract_info` (`dep_id`, `contract_name`, `pro_id`, `total_amount`, `part_a`, `part_b`, `sign_time`, `sign_addr`, `begin_date`, @@ -58,7 +58,7 @@ update `contract_info` set `del_flg` = '1' where `id` = #{id,jdbcType=INTEGER} - + update `contract_info` set `dep_id` = #{depId,jdbcType=VARCHAR}, `contract_name` = #{contractName,jdbcType=VARCHAR}, `pro_id` = #{proId,jdbcType=VARCHAR}, diff --git a/src/main/java/com/soft/line/service/CertificateInfoService.java b/src/main/java/com/soft/line/service/CertificateInfoService.java index 212444d..3101e97 100644 --- a/src/main/java/com/soft/line/service/CertificateInfoService.java +++ b/src/main/java/com/soft/line/service/CertificateInfoService.java @@ -21,11 +21,11 @@ public interface CertificateInfoService { public void delete(final Map map); - public void add(final Map map); + public void add(final CertificateInfo certificateInfo); public void insertRecord(List list); - public void update(final Map map); + public void update(final CertificateInfo certificateInfo); public int countByCId(Integer id,String cId); diff --git a/src/main/java/com/soft/line/service/ContractInfoService.java b/src/main/java/com/soft/line/service/ContractInfoService.java index 1bac93a..7acc362 100644 --- a/src/main/java/com/soft/line/service/ContractInfoService.java +++ b/src/main/java/com/soft/line/service/ContractInfoService.java @@ -20,11 +20,11 @@ public interface ContractInfoService { public void delete(Map map); - public void add(Map map); + public void add(ContractInfo contractInfo); public void insertList(List list); - public void update(Map map); + public void update(ContractInfo contractInfo); public int countContractByIdAndName(Integer id,String contractName); diff --git a/src/main/java/com/soft/line/service/impl/CertificateInfoServiceImpl.java b/src/main/java/com/soft/line/service/impl/CertificateInfoServiceImpl.java index 4ff09ff..9881f12 100644 --- a/src/main/java/com/soft/line/service/impl/CertificateInfoServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/CertificateInfoServiceImpl.java @@ -63,16 +63,16 @@ public class CertificateInfoServiceImpl implements CertificateInfoService { } @Override - public void add(Map map) { - map.put("modifyPerson","admin"); - certificateInfoMapper.insert(map); + public void add(CertificateInfo certificateInfo) { + certificateInfo.setModifyPerson("admin"); + certificateInfoMapper.insert(certificateInfo); } @Override - public void update(Map map) { - map.put("modifyPerson","admin"); - map.put("modifyTime",new Date()); - certificateInfoMapper.update(map); + public void update(CertificateInfo certificateInfo) { + certificateInfo.setModifyPerson("admin"); + certificateInfo.setModifyTime(new Date()); + certificateInfoMapper.update(certificateInfo); } @Override diff --git a/src/main/java/com/soft/line/service/impl/ContractInfoServiceImpl.java b/src/main/java/com/soft/line/service/impl/ContractInfoServiceImpl.java index e881caf..8f2530c 100644 --- a/src/main/java/com/soft/line/service/impl/ContractInfoServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/ContractInfoServiceImpl.java @@ -52,16 +52,16 @@ public class ContractInfoServiceImpl implements ContractInfoService{ } @Override - public void add(Map map) { - map.put("modifyPerson","admin"); - contractInfoMapper.insert(map); + public void add(ContractInfo contractInfo) { + contractInfo.setModifyPerson("admin"); + contractInfoMapper.insert(contractInfo); } @Override - public void update(Map map) { - map.put("modifyPerson","admin"); - map.put("modifyTime",new Date()); - contractInfoMapper.update(map); + public void update(ContractInfo contractInfo) { + contractInfo.setModifyPerson("admin"); + contractInfo.setModifyTime(new Date()); + contractInfoMapper.update(contractInfo); } @Override diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 1fe2434..a4f977f 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -49,9 +49,9 @@ mybatis.configuration.call-setters-on-nulls=true #ļϴַ #windows -uploadFileDir=D:/softline-files-manage-uploadFiles/ +#uploadFileDir=D:/softline-files-manage-uploadFiles/ #linux -#uploadFileDir=user/softline-files-manage-uploadFiles/ +uploadFileDir=/user/softline-files-manage-uploadFiles/ #ļϴӳַ uploadFileMapping=uploadFiles/ -- Gitee From b1cf090ff9676b0afb3c83f9f81434068cf1e4b5 Mon Sep 17 00:00:00 2001 From: wpb <1121178778@qq.com> Date: Wed, 17 Jun 2020 15:11:47 +0800 Subject: [PATCH 115/211] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E4=BF=AE=E6=94=B9=E5=8C=85=E6=8B=AC=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E3=80=81=E5=90=88=E5=90=8C=E8=AF=81=E4=B9=A6?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppletCertificateController.java | 57 ++++++------- .../controller/AppletCommonController.java | 23 +++-- .../controller/AppletContractController.java | 58 ++++++------- .../line/controller/MpLoginController.java | 12 ++- .../soft/line/entity/AppletCertificate.java | 62 ++++++++++++++ .../com/soft/line/entity/AppletContract.java | 78 +++++++++++++++++ .../soft/line/filter/ConfigurationFilter.java | 3 +- .../line/mapper/AppletCertificateMapper.java | 10 +-- .../line/mapper/AppletCertificateMapper.xml | 12 ++- .../soft/line/mapper/AppletCommonMapper.java | 1 - .../line/mapper/AppletContractMapper.java | 10 +-- .../soft/line/mapper/AppletContractMapper.xml | 14 +++- .../com/soft/line/mapper/UserInfoMapper.java | 2 +- .../com/soft/line/mapper/UserInfoMapper.xml | 18 ++-- .../service/AppletCertificateService.java | 40 +++++---- .../line/service/AppletCommonService.java | 10 +-- .../line/service/AppletContractService.java | 28 +++---- .../com/soft/line/service/LoginService.java | 2 +- .../impl/AppletCertificateServiceImpl.java | 77 +++++++++-------- .../service/impl/AppletCommonServiceImpl.java | 24 +++--- .../impl/AppletContractServiceImpl.java | 84 ++++++++++--------- .../line/service/impl/LoginServiceImpl.java | 17 ++-- 22 files changed, 398 insertions(+), 244 deletions(-) create mode 100644 src/main/java/com/soft/line/entity/AppletCertificate.java create mode 100644 src/main/java/com/soft/line/entity/AppletContract.java diff --git a/src/main/java/com/soft/line/controller/AppletCertificateController.java b/src/main/java/com/soft/line/controller/AppletCertificateController.java index f07c83c..91610df 100644 --- a/src/main/java/com/soft/line/controller/AppletCertificateController.java +++ b/src/main/java/com/soft/line/controller/AppletCertificateController.java @@ -1,17 +1,17 @@ package com.soft.line.controller; import com.soft.line.common.AppletSystemConstant; -import com.soft.line.entity.CertificateInfo; +import com.soft.line.entity.AppletCertificate; import com.soft.line.service.AppletCertificateService; -import com.soft.line.util.exception.CommonResult; +import com.soft.line.util.MP.AjaxResult; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.StringUtils; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.List; import java.util.Map; /** @@ -35,7 +35,7 @@ public class AppletCertificateController { * @return */ @PostMapping("/getCertificateNum") - public CommonResult> getCertificateNum() { + public AjaxResult getCertificateNum() { return appletCertificateService.getCertificateNum(); } @@ -46,9 +46,9 @@ public class AppletCertificateController { * @return */ @PostMapping("/getCertificateYearList") - public CommonResult>> getCertificateYearList(@RequestBody Map paramMap) { + public AjaxResult getCertificateYearList(@RequestBody Map paramMap) { if (!StringUtils.hasText(paramMap.get(AppletSystemConstant.CERT_TYPE).toString())) { - return CommonResult.failed("证书类型不为空"); + return AjaxResult.error("证书类型不为空"); } return appletCertificateService.getCertificateYearList(paramMap); } @@ -60,18 +60,18 @@ public class AppletCertificateController { * @return */ @PostMapping("/getCertificateList") - public CommonResult> getCertificateList(@RequestBody Map paramMap) { + public AjaxResult getCertificateList(@RequestBody Map paramMap) { if (!StringUtils.hasText(paramMap.get(AppletSystemConstant.CERT_TYPE).toString())) { - return CommonResult.failed("证书类型不为空"); + return AjaxResult.error("证书类型不为空"); } if (!StringUtils.hasText(paramMap.get(AppletSystemConstant.BEGIN_DATE).toString())) { - return CommonResult.failed("选择的年不存在"); + return AjaxResult.error("选择的年不存在"); } if (!StringUtils.hasText(String.valueOf(paramMap.get(AppletSystemConstant.PAGE_NUM)))) { - return CommonResult.failed("第几页不能为空"); + return AjaxResult.error("第几页不能为空"); } if (!StringUtils.hasText(String.valueOf(paramMap.get(AppletSystemConstant.DATA_NUM)))) { - return CommonResult.failed("条数不能为空"); + return AjaxResult.error("条数不能为空"); } return appletCertificateService.getCertificateList(paramMap); } @@ -84,9 +84,9 @@ public class AppletCertificateController { * @return */ @PostMapping("/getCertificate") - public CommonResult> getCertificate(@RequestBody Map paramMap) { + public AjaxResult getCertificate(@RequestBody Map paramMap) { if(paramMap.get(AppletSystemConstant.ID) == null){ - return CommonResult.failed("请选择证书"); + return AjaxResult.error("请选择证书"); } return appletCertificateService.getCertificate(paramMap); } @@ -95,18 +95,13 @@ public class AppletCertificateController { * 小程序使用 * 修改证书信息 * - * @param paramMap 参数 + * @param appletCertificate 参数 * @return */ @PostMapping("/updateCertificate") - public CommonResult updateCertificate(@RequestBody Map paramMap) { - if(!StringUtils.hasText(paramMap.get(AppletSystemConstant.CERT_ID).toString())){ - return CommonResult.failed("证书编号不存在"); - } - if(!StringUtils.hasText(paramMap.get(AppletSystemConstant.ID).toString())){ - return CommonResult.failed("证书唯一码不存在"); - } - return appletCertificateService.updateCertificate(paramMap); + public AjaxResult updateCertificate(@Validated @RequestBody AppletCertificate appletCertificate) { + + return appletCertificateService.updateCertificate(appletCertificate); } /** @@ -117,9 +112,9 @@ public class AppletCertificateController { * @return */ @PostMapping("/deleteCertificate") - public CommonResult deleteCertificate(@RequestBody Map paramMap) { + public AjaxResult deleteCertificate(@RequestBody Map paramMap) { if(!StringUtils.hasText(paramMap.get(AppletSystemConstant.ID).toString())){ - return CommonResult.failed("证书唯一码不存在"); + return AjaxResult.error("证书唯一码不存在"); } return appletCertificateService.deleteCertificate(paramMap); } @@ -132,12 +127,12 @@ public class AppletCertificateController { * @return */ @PostMapping("/getCertificateSearchList") - public CommonResult> getCertificateSearchList(@RequestBody Map paramMap) { + public AjaxResult getCertificateSearchList(@RequestBody Map paramMap) { if (!StringUtils.hasText(String.valueOf(paramMap.get(AppletSystemConstant.PAGE_NUM)))) { - return CommonResult.failed("第几页不能为空"); + return AjaxResult.error("第几页不能为空"); } if (!StringUtils.hasText(String.valueOf(paramMap.get(AppletSystemConstant.DATA_NUM)))) { - return CommonResult.failed("条数不能为空"); + return AjaxResult.error("条数不能为空"); } return appletCertificateService.getCertificateSearchList(paramMap); } @@ -146,12 +141,12 @@ public class AppletCertificateController { * 小程序使用 * 新增证书 * - * @param certificateInfo 参数 + * @param appletCertificate 参数 * @return */ @PostMapping("/addCertificate") - public CommonResult> addCertificate(@RequestBody CertificateInfo certificateInfo) { - return appletCertificateService.addCertificate(certificateInfo); + public AjaxResult addCertificate(@Validated @RequestBody AppletCertificate appletCertificate) { + return appletCertificateService.addCertificate(appletCertificate); } /** @@ -162,7 +157,7 @@ public class AppletCertificateController { * @return */ @PostMapping("/getCertificateQueryList") - public CommonResult> getCertificateQueryList(@RequestBody Map paramMap) { + public AjaxResult getCertificateQueryList(@RequestBody Map paramMap) { return appletCertificateService.getCertificateQueryList(paramMap); } diff --git a/src/main/java/com/soft/line/controller/AppletCommonController.java b/src/main/java/com/soft/line/controller/AppletCommonController.java index 5ddbe6d..8de1687 100644 --- a/src/main/java/com/soft/line/controller/AppletCommonController.java +++ b/src/main/java/com/soft/line/controller/AppletCommonController.java @@ -1,7 +1,7 @@ package com.soft.line.controller; import com.soft.line.service.AppletCommonService; -import com.soft.line.util.exception.CommonResult; +import com.soft.line.util.MP.AjaxResult; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.PostMapping; @@ -10,9 +10,6 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; -import javax.annotation.Resource; -import java.util.List; -import java.util.Map; /** * 小程序接口 @@ -37,7 +34,7 @@ public class AppletCommonController { * @return */ @PostMapping("/getBaseData") - public CommonResult>>> getBaseData() { + public AjaxResult getBaseData() { return appletCommonService.getBaseData(); } @@ -52,19 +49,19 @@ public class AppletCommonController { * @return */ @PostMapping("/uploadContractAttach") - public CommonResult uploadContractAttach(@RequestParam("file") MultipartFile file, + public AjaxResult uploadContractAttach(@RequestParam("file") MultipartFile file, @RequestParam("id") Integer id, @RequestParam("fileName") String fileName, @RequestParam("modifyPerson") String modifyPerson) { if (!StringUtils.hasText(fileName)) { - return CommonResult.failed("请填写合同名称"); + return AjaxResult.error("请填写合同名称"); } if (id == null) { - return CommonResult.failed("请选择部门"); + return AjaxResult.error("请选择部门"); } if (file.isEmpty()) { - return CommonResult.failed("请选择要上传的文件！！！"); + return AjaxResult.error("请选择要上传的文件！！！"); } return appletCommonService.uploadContractAttach(file, id, fileName, modifyPerson); @@ -82,19 +79,19 @@ public class AppletCommonController { * @return */ @PostMapping("/uploadCertificateAttach") - public CommonResult uploadCertificateAttach(@RequestParam("file") MultipartFile file, + public AjaxResult uploadCertificateAttach(@RequestParam("file") MultipartFile file, @RequestParam("id") Integer id, @RequestParam("fileName") String fileName, @RequestParam("modifyPerson") String modifyPerson) { if (!StringUtils.hasText(fileName)) { - return CommonResult.failed("证书名称不存在"); + return AjaxResult.error("证书名称不存在"); } if (id == null) { - return CommonResult.failed("请选择部门"); + return AjaxResult.error("请选择部门"); } if (file.isEmpty()) { - return CommonResult.failed("请选择要上传的文件！！！"); + return AjaxResult.error("请选择要上传的文件！！！"); } return appletCommonService.uploadCertificateAttach(file, id, fileName, modifyPerson); diff --git a/src/main/java/com/soft/line/controller/AppletContractController.java b/src/main/java/com/soft/line/controller/AppletContractController.java index 6bc13e7..d49a6f5 100644 --- a/src/main/java/com/soft/line/controller/AppletContractController.java +++ b/src/main/java/com/soft/line/controller/AppletContractController.java @@ -1,15 +1,15 @@ package com.soft.line.controller; import com.soft.line.common.AppletSystemConstant; -import com.soft.line.entity.ContractInfo; +import com.soft.line.entity.AppletContract; import com.soft.line.service.AppletContractService; -import com.soft.line.util.exception.CommonResult; -import lombok.extern.slf4j.Slf4j; +import com.soft.line.util.MP.AjaxResult; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.StringUtils; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import java.util.List; + import java.util.Map; /** @@ -33,7 +33,7 @@ public class AppletContractController { * @return */ @PostMapping("/getContractNum") - public CommonResult> getContractNum() { + public AjaxResult getContractNum() { return appletContractService.getContractNum(); } @@ -45,9 +45,9 @@ public class AppletContractController { * @return */ @PostMapping("/getContractYearList") - public CommonResult>> getContractYearList(@RequestBody Map paraMap) { + public AjaxResult getContractYearList(@RequestBody Map paraMap) { if (!StringUtils.hasText(String.valueOf(paraMap.get(AppletSystemConstant.DEP_ID)))) { - return CommonResult.failed("部门不能为空"); + return AjaxResult.error("部门不能为空"); } return appletContractService.getContractYearList(paraMap); } @@ -60,18 +60,18 @@ public class AppletContractController { * @return */ @PostMapping("/getContractList") - public CommonResult> getContractList(@RequestBody Map paraMap) { + public AjaxResult getContractList(@RequestBody Map paraMap) { if (!StringUtils.hasText(String.valueOf(paraMap.get(AppletSystemConstant.DEP_ID)))) { - return CommonResult.failed("部门不能为空"); + return AjaxResult.error("部门不能为空"); } if (!StringUtils.hasText(String.valueOf(paraMap.get(AppletSystemConstant.SIGN_TIME)))) { - return CommonResult.failed("年限不能为空"); + return AjaxResult.error("年限不能为空"); } if (!StringUtils.hasText(String.valueOf(paraMap.get(AppletSystemConstant.PAGE_NUM)))) { - return CommonResult.failed("第几页不能为空"); + return AjaxResult.error("第几页不能为空"); } if (!StringUtils.hasText(String.valueOf(paraMap.get(AppletSystemConstant.DATA_NUM)))) { - return CommonResult.failed("条数不能为空"); + return AjaxResult.error("条数不能为空"); } return appletContractService.getContractList(paraMap); } @@ -84,15 +84,15 @@ public class AppletContractController { * @return */ @PostMapping("/getContractSearchList") - public CommonResult> getContractSearchList(@RequestBody Map paraMap) { + public AjaxResult getContractSearchList(@RequestBody Map paraMap) { if (!StringUtils.hasText(String.valueOf(paraMap.get(AppletSystemConstant.CONTRACT_NAME)))) { - return CommonResult.failed("合同名称不能为空"); + return AjaxResult.error("合同名称不能为空"); } if (!StringUtils.hasText(String.valueOf(paraMap.get(AppletSystemConstant.PAGE_NUM)))) { - return CommonResult.failed("第几页不能为空"); + return AjaxResult.error("第几页不能为空"); } if (!StringUtils.hasText(String.valueOf(paraMap.get(AppletSystemConstant.DATA_NUM)))) { - return CommonResult.failed("条数不能为空"); + return AjaxResult.error("条数不能为空"); } return appletContractService.getContractSearchList(paraMap); } @@ -104,12 +104,12 @@ public class AppletContractController { * @return */ @PostMapping("/getContractQueryList") - public CommonResult> getContractQueryList(@RequestBody Map paraMap) { + public AjaxResult getContractQueryList(@RequestBody Map paraMap) { if (!StringUtils.hasText(String.valueOf(paraMap.get(AppletSystemConstant.PAGE_NUM)))) { - return CommonResult.failed("第几页不能为空"); + return AjaxResult.error("第几页不能为空"); } if (!StringUtils.hasText(String.valueOf(paraMap.get(AppletSystemConstant.DATA_NUM)))) { - return CommonResult.failed("条数不能为空"); + return AjaxResult.error("条数不能为空"); } return appletContractService.getContractQueryList(paraMap); } @@ -118,28 +118,28 @@ public class AppletContractController { * 小程序使用接口 * 新增合同 * - * @param contractInfo 参数 + * @param appletContract 参数 * @return */ @PostMapping("/addContract") - public CommonResult> addContract(@RequestBody ContractInfo contractInfo) { - return appletContractService.addContract(contractInfo); + public AjaxResult addContract(@Validated @RequestBody AppletContract appletContract) { + return appletContractService.addContract(appletContract); } /** * 小程序使用 * 修改合同信息 * - * @param paraMap 参数 + * @param appletContract 参数 * @return */ @PostMapping("/updateContract") - public CommonResult updateContract(@RequestBody Map paraMap) { - if(paraMap.get(AppletSystemConstant.ID) == null){ - return CommonResult.failed(); + public AjaxResult updateContract(@Validated @RequestBody AppletContract appletContract) { + if(appletContract.getId() == null){ + return AjaxResult.error("请选择合同"); } - return appletContractService.updateContract(paraMap); + return appletContractService.updateContract(appletContract); } /** @@ -149,7 +149,7 @@ public class AppletContractController { * @return */ @PostMapping("/getContract") - public CommonResult> getContract(@RequestBody Map paraMap) { + public AjaxResult getContract(@RequestBody Map paraMap) { return appletContractService.getContract(paraMap); } @@ -161,7 +161,7 @@ public class AppletContractController { * @return */ @PostMapping("/deleteContract") - public CommonResult deleteContract(@RequestBody Map paraMap) { + public AjaxResult deleteContract(@RequestBody Map paraMap) { return appletContractService.deleteContract(paraMap); } diff --git a/src/main/java/com/soft/line/controller/MpLoginController.java b/src/main/java/com/soft/line/controller/MpLoginController.java index 9666628..9b5ac21 100644 --- a/src/main/java/com/soft/line/controller/MpLoginController.java +++ b/src/main/java/com/soft/line/controller/MpLoginController.java @@ -1,5 +1,7 @@ package com.soft.line.controller; +import com.soft.line.filter.HttpRequestUtil; +import com.soft.line.filter.UserTokenDto; import com.soft.line.service.LoginService; import com.soft.line.util.MP.AjaxResult; import com.soft.line.util.exception.ResultData; @@ -7,6 +9,7 @@ import io.swagger.models.auth.In; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; @@ -18,6 +21,7 @@ import java.util.Map; * @version 0.1 */ @RestController +@RequestMapping("/applet") public class MpLoginController { @Autowired @@ -53,11 +57,11 @@ public class MpLoginController { /** * 解除绑定 - * @param paraMap + * * @return */ - @PostMapping("/deleteOpenId") - public AjaxResult deleteOpenId(@RequestBody Map paraMap){ - return loginService.deleteOpenId(Integer.valueOf(paraMap.get("id").toString())); + @PostMapping("/untie") + public AjaxResult untie(){ + return loginService.untie(); } } diff --git a/src/main/java/com/soft/line/entity/AppletCertificate.java b/src/main/java/com/soft/line/entity/AppletCertificate.java new file mode 100644 index 0000000..22f5ede --- /dev/null +++ b/src/main/java/com/soft/line/entity/AppletCertificate.java @@ -0,0 +1,62 @@ +package com.soft.line.entity; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; +import java.util.Date; +import java.util.List; + +/** + * 小程序校验证书 + * @author wpb + * @version 1.0 + * @date 2020/6/15 16:41 + */ +@Data +public class AppletCertificate { + + private Integer id; + + @NotBlank + private String certId; + + @NotBlank + @Size(max = 200) + private String certType; + + @NotBlank + @Size(max = 200) + private String certName; + + @NotBlank + @Size(max = 200) + private String projectName; + + @NotBlank + @Size(max = 200) + private String certUnit; + + @NotNull + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "Asia/Shanghai") + private Date beginDate; + + @NotNull + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "Asia/Shanghai") + private Date endDate; + + @Size(max = 200) + private String note; + + @NotBlank + private String modifyPerson; + + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "Asia/Shanghai") + private Date modifyTime; + + private String delFlg; + + private List deleteAttachmentList; +} diff --git a/src/main/java/com/soft/line/entity/AppletContract.java b/src/main/java/com/soft/line/entity/AppletContract.java new file mode 100644 index 0000000..9c2a079 --- /dev/null +++ b/src/main/java/com/soft/line/entity/AppletContract.java @@ -0,0 +1,78 @@ +package com.soft.line.entity; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; +import java.math.BigDecimal; +import java.util.Date; +import java.util.List; + +/** + * 小程序校验合同 + * @author wpb + * @version 1.0 + * @date 2020/6/15 16:09 + */ +@Data +public class AppletContract { + + private Integer id; + + @NotBlank + private String depId; + + @NotBlank + @Size(max = 200) + private String contractName; + + @NotBlank + @Size(max = 200) + private String proId; + + @NotNull + private BigDecimal totalAmount; + + @NotBlank + @Size(max = 200) + private String partA; + + @NotBlank + @Size(max = 200) + private String partB; + + @NotNull + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "Asia/Shanghai") + private Date signTime; + + @NotBlank + @Size(max = 200) + private String signAddr; + + @NotNull + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "Asia/Shanghai") + private Date beginDate; + + @NotNull + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "Asia/Shanghai") + private Date endDate; + + @NotBlank + @Size(max = 200) + private String payment; + + @Size(max = 200) + private String note; + + @NotBlank + private String modifyPerson; + + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "Asia/Shanghai") + private Date modifyTime; + + private String delFlg; + + private List deleteAttachmentList; +} diff --git a/src/main/java/com/soft/line/filter/ConfigurationFilter.java b/src/main/java/com/soft/line/filter/ConfigurationFilter.java index 2a9ed32..9c0c620 100644 --- a/src/main/java/com/soft/line/filter/ConfigurationFilter.java +++ b/src/main/java/com/soft/line/filter/ConfigurationFilter.java @@ -66,7 +66,8 @@ public class ConfigurationFilter { final String uri = request.getRequestURI(); String auth = request.getHeader("Access-Token"); Token token = null; - if (!uri.contains("/")) { + //if (!uri.contains("/")) { + if (!uri.contains("/") && !uri.contains("/autoLogin") && !uri.contains("/bindUserInfo") && !uri.contains("/uploadContractAttach") && !uri.contains("/uploadCertificateAttach") && !uri.contains("/uploadFiles") ) { if (auth == null || "".equals(auth)) { if (uri.contains("/file/download/")) { auth = request.getParameter("token"); diff --git a/src/main/java/com/soft/line/mapper/AppletCertificateMapper.java b/src/main/java/com/soft/line/mapper/AppletCertificateMapper.java index 10723fc..904027f 100644 --- a/src/main/java/com/soft/line/mapper/AppletCertificateMapper.java +++ b/src/main/java/com/soft/line/mapper/AppletCertificateMapper.java @@ -1,6 +1,6 @@ package com.soft.line.mapper; -import com.soft.line.entity.CertificateInfo; +import com.soft.line.entity.AppletCertificate; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -58,10 +58,10 @@ public interface AppletCertificateMapper { /** * 修改证书 * - * @param paramMap 参数 + * @param appletCertificate 参数 * @return */ - int updateCertificate(Map paramMap); + int updateCertificate(AppletCertificate appletCertificate); /** * 根据证书编号和！id，校验证书编号是否重复 @@ -99,10 +99,10 @@ public interface AppletCertificateMapper { /** * 新增证书 * - * @param certificateInfo 参数 + * @param appletCertificate 参数 * @return */ - int addCertificate(CertificateInfo certificateInfo); + int addCertificate(AppletCertificate appletCertificate); /** * 校验 证书编号是否存在 diff --git a/src/main/java/com/soft/line/mapper/AppletCertificateMapper.xml b/src/main/java/com/soft/line/mapper/AppletCertificateMapper.xml index e0356a4..3abf905 100644 --- a/src/main/java/com/soft/line/mapper/AppletCertificateMapper.xml +++ b/src/main/java/com/soft/line/mapper/AppletCertificateMapper.xml @@ -87,7 +87,9 @@ cert_unit = #{certUnit}, begin_date = #{beginDate}, end_date = #{endDate}, - note = #{note}, + + note = #{note}, + modify_person = #{modifyPerson}, modify_time = NOW() WHERE @@ -155,7 +157,9 @@ cert_unit, begin_date, end_date, - note, + + note, + modify_person, modify_time, del_flg @@ -169,7 +173,9 @@ #{certUnit}, #{beginDate}, #{endDate}, - #{note}, + + #{note}, + #{modifyPerson}, NOW(), 0 diff --git a/src/main/java/com/soft/line/mapper/AppletCommonMapper.java b/src/main/java/com/soft/line/mapper/AppletCommonMapper.java index 13d23d4..54eea38 100644 --- a/src/main/java/com/soft/line/mapper/AppletCommonMapper.java +++ b/src/main/java/com/soft/line/mapper/AppletCommonMapper.java @@ -1,6 +1,5 @@ package com.soft.line.mapper; -import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.Date; diff --git a/src/main/java/com/soft/line/mapper/AppletContractMapper.java b/src/main/java/com/soft/line/mapper/AppletContractMapper.java index 0933f99..06f2321 100644 --- a/src/main/java/com/soft/line/mapper/AppletContractMapper.java +++ b/src/main/java/com/soft/line/mapper/AppletContractMapper.java @@ -1,6 +1,6 @@ package com.soft.line.mapper; -import com.soft.line.entity.ContractInfo; +import com.soft.line.entity.AppletContract; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -82,18 +82,18 @@ public interface AppletContractMapper { /** * 添加合同 * - * @param contractInfo + * @param appletContract * @return */ - int addContract(ContractInfo contractInfo); + int addContract(AppletContract appletContract); /** * 修改合同 * - * @param paraMap + * @param appletContract 参数 * @return */ - int updateContract(Map paraMap); + int updateContract(AppletContract appletContract); /** * 通过id，查询部门详情 diff --git a/src/main/java/com/soft/line/mapper/AppletContractMapper.xml b/src/main/java/com/soft/line/mapper/AppletContractMapper.xml index 43a3fb1..62b1996 100644 --- a/src/main/java/com/soft/line/mapper/AppletContractMapper.xml +++ b/src/main/java/com/soft/line/mapper/AppletContractMapper.xml @@ -144,13 +144,19 @@ insert into `contract_info` (`dep_id`, `contract_name`, `pro_id`, `total_amount`, `part_a`, `part_b`, `sign_time`, `sign_addr`, `begin_date`, - `end_date`, `payment`, `note`, + `end_date`, `payment`, + + `note`, + `modify_person`, `modify_time`, `del_flg` ) values (#{depId,jdbcType=VARCHAR}, #{contractName,jdbcType=VARCHAR}, #{proId,jdbcType=VARCHAR}, #{totalAmount,jdbcType=DECIMAL}, #{partA,jdbcType=VARCHAR}, #{partB,jdbcType=VARCHAR}, #{signTime,jdbcType=TIMESTAMP}, #{signAddr,jdbcType=VARCHAR}, #{beginDate,jdbcType=TIMESTAMP}, - #{endDate,jdbcType=TIMESTAMP}, #{payment,jdbcType=VARCHAR}, #{note,jdbcType=VARCHAR}, + #{endDate,jdbcType=TIMESTAMP}, #{payment,jdbcType=VARCHAR}, + + #{note,jdbcType=VARCHAR}, + #{modifyPerson,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}, #{delFlg,jdbcType=CHAR} ) @@ -169,7 +175,9 @@ begin_date = #{beginDate} , end_date = #{endDate} , payment = #{payment} , - note = #{note} , + + note = #{note} , + modify_person = #{modifyPerson} , modify_time = #{modifyTime} where id = #{id} diff --git a/src/main/java/com/soft/line/mapper/UserInfoMapper.java b/src/main/java/com/soft/line/mapper/UserInfoMapper.java index d6f0efa..f167caf 100644 --- a/src/main/java/com/soft/line/mapper/UserInfoMapper.java +++ b/src/main/java/com/soft/line/mapper/UserInfoMapper.java @@ -82,7 +82,7 @@ public interface UserInfoMapper { */ int updateOpenIdById(String openId, int id); - int updatePassword(Map map); + int updatePassword(int id,String password); int deleteOpenId(int id); } \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/UserInfoMapper.xml b/src/main/java/com/soft/line/mapper/UserInfoMapper.xml index 6da14cd..623c1dc 100644 --- a/src/main/java/com/soft/line/mapper/UserInfoMapper.xml +++ b/src/main/java/com/soft/line/mapper/UserInfoMapper.xml @@ -117,22 +117,22 @@ `phone`=#{phone,jdbcType=VARCHAR} - + UPDATE `user_info` - SET `open_id`=#{openId,jdbcType=VARCHAR} - WHERE `id`=#{id,jdbcType=INTEGER} + SET `open_id`=#{openId} + WHERE `id`=#{id} - + UPDATE `user_info` - SET `password`=#{password,jdbcType=VARCHAR} - WHERE `id`=#{id,jdbcType=INTEGER} + SET `password`=#{password} + WHERE `id`=#{id} - + UPDATE `user_info` - SET `openId`='' - WHERE `id`=#{id,jdbcType=INTEGER} + SET `open_id`=null + WHERE `id`=#{id} \ No newline at end of file diff --git a/src/main/java/com/soft/line/service/AppletCertificateService.java b/src/main/java/com/soft/line/service/AppletCertificateService.java index 267ff33..a825f7a 100644 --- a/src/main/java/com/soft/line/service/AppletCertificateService.java +++ b/src/main/java/com/soft/line/service/AppletCertificateService.java @@ -1,9 +1,8 @@ package com.soft.line.service; -import com.soft.line.entity.CertificateInfo; -import com.soft.line.util.exception.CommonResult; +import com.soft.line.entity.AppletCertificate; +import com.soft.line.util.MP.AjaxResult; -import java.util.List; import java.util.Map; /** @@ -20,7 +19,7 @@ public interface AppletCertificateService { * * @return */ - CommonResult> getCertificateNum(); + AjaxResult getCertificateNum(); /** * 根据证书类型获取证书年列表数据 @@ -28,54 +27,61 @@ public interface AppletCertificateService { * @param paramMap 参数 * @return */ - CommonResult>> getCertificateYearList(Map paramMap); + AjaxResult getCertificateYearList(Map paramMap); /** - * 根据证书类型cert_type和起始日期年份以及当前页、每页显示条数分页查询证书年列表 + * 根据证书类型cert_type和起始日期年份以及当前页、每页显示条数分页查询证书年列表 + * * @param paramMap 参数 * @return */ - CommonResult> getCertificateList(Map paramMap); + AjaxResult getCertificateList(Map paramMap); /** - * 根据证书id查询证书信息 + * 根据证书id查询证书信息 + * * @param paramMap 参数 * @return */ - CommonResult> getCertificate(Map paramMap); + AjaxResult getCertificate(Map paramMap); /** - * 修改证书 - * @param paramMap + * 修改证书 + * + * @param appletCertificate * @return */ - CommonResult updateCertificate(Map paramMap); + AjaxResult updateCertificate(AppletCertificate appletCertificate); /** * 删除证书 + * * @param paramMap 参数 * @return */ - CommonResult deleteCertificate(Map paramMap); + AjaxResult deleteCertificate(Map paramMap); /** * 根据证书名称分页模糊查询证书列表 + * * @param paramMap 参数 * @return */ - CommonResult> getCertificateSearchList(Map paramMap); + AjaxResult getCertificateSearchList(Map paramMap); /** * 添加证书 - * @param certificateInfo 参数 + * + * @param appletCertificate 参数 * @return */ - CommonResult> addCertificate(CertificateInfo certificateInfo); + AjaxResult addCertificate(AppletCertificate appletCertificate); /** * 根据证书详情信息分页查询证书列表 + * * @param paramMap 参数 * @return */ - CommonResult> getCertificateQueryList(Map paramMap); + AjaxResult getCertificateQueryList(Map paramMap); } diff --git a/src/main/java/com/soft/line/service/AppletCommonService.java b/src/main/java/com/soft/line/service/AppletCommonService.java index 7226aff..b00bb23 100644 --- a/src/main/java/com/soft/line/service/AppletCommonService.java +++ b/src/main/java/com/soft/line/service/AppletCommonService.java @@ -1,10 +1,8 @@ package com.soft.line.service; -import com.soft.line.util.exception.CommonResult; +import com.soft.line.util.MP.AjaxResult; import org.springframework.web.multipart.MultipartFile; -import java.util.List; -import java.util.Map; /** * 小程序 公用 @@ -19,7 +17,7 @@ public interface AppletCommonService { * * @return */ - CommonResult>>> getBaseData(); + AjaxResult getBaseData(); /** * 合同上传 @@ -30,7 +28,7 @@ public interface AppletCommonService { * @param modifyPerson 修改人 * @return */ - CommonResult uploadContractAttach(MultipartFile file, int id, String fileName, String modifyPerson); + AjaxResult uploadContractAttach(MultipartFile file, int id, String fileName, String modifyPerson); /** * 证书 file上传 @@ -41,7 +39,7 @@ public interface AppletCommonService { * @param modifyPerson 修改人 * @return */ - CommonResult uploadCertificateAttach(MultipartFile file, int id, String fileName, String modifyPerson); + AjaxResult uploadCertificateAttach(MultipartFile file, int id, String fileName, String modifyPerson); } diff --git a/src/main/java/com/soft/line/service/AppletContractService.java b/src/main/java/com/soft/line/service/AppletContractService.java index 4a7b8c4..a5ffbc1 100644 --- a/src/main/java/com/soft/line/service/AppletContractService.java +++ b/src/main/java/com/soft/line/service/AppletContractService.java @@ -1,10 +1,8 @@ package com.soft.line.service; -import com.soft.line.entity.ContractInfo; -import com.soft.line.util.exception.CommonResult; -import org.springframework.web.multipart.MultipartFile; +import com.soft.line.entity.AppletContract; +import com.soft.line.util.MP.AjaxResult; -import java.util.List; import java.util.Map; /** @@ -22,7 +20,7 @@ public interface AppletContractService { * * @return */ - CommonResult> getContractNum(); + AjaxResult getContractNum(); /** * 根据部门id获取合同年列表数据 @@ -30,7 +28,7 @@ public interface AppletContractService { * @param paraMap 部门编号 * @return */ - CommonResult>> getContractYearList(Map paraMap); + AjaxResult getContractYearList(Map paraMap); /** * 根据部门id和签订年份分页查询合同列表 @@ -38,7 +36,7 @@ public interface AppletContractService { * @param paraMap 参数 * @return */ - CommonResult> getContractList(Map paraMap); + AjaxResult getContractList(Map paraMap); /** * 根据合同名称分页模糊查询合同列表 @@ -46,7 +44,7 @@ public interface AppletContractService { * @param paraMap 参数 * @return */ - CommonResult> getContractSearchList(Map paraMap); + AjaxResult getContractSearchList(Map paraMap); /** * 根据合同详情信息分页查询合同列表 @@ -54,23 +52,23 @@ public interface AppletContractService { * @param paraMap 参数 * @return */ - CommonResult> getContractQueryList(Map paraMap); + AjaxResult getContractQueryList(Map paraMap); /** * 添加合同 * - * @param contractInfo 参数 + * @param appletContract 参数 * @return */ - CommonResult> addContract(ContractInfo contractInfo); + AjaxResult addContract(AppletContract appletContract); /** * 修改合同信息 * - * @param paraMap 入参 + * @param appletContract 入参 * @return */ - CommonResult updateContract(Map paraMap); + AjaxResult updateContract(AppletContract appletContract); /** * 根据合同id查询合同信息 @@ -78,7 +76,7 @@ public interface AppletContractService { * @param paraMap 参数 * @return */ - CommonResult> getContract(Map paraMap); + AjaxResult getContract(Map paraMap); /** * 删除合同信息 @@ -86,7 +84,7 @@ public interface AppletContractService { * @param paraMap 参数 * @return */ - CommonResult deleteContract(Map paraMap); + AjaxResult deleteContract(Map paraMap); } diff --git a/src/main/java/com/soft/line/service/LoginService.java b/src/main/java/com/soft/line/service/LoginService.java index 0eeb27d..02f1fff 100644 --- a/src/main/java/com/soft/line/service/LoginService.java +++ b/src/main/java/com/soft/line/service/LoginService.java @@ -26,7 +26,7 @@ public interface LoginService { AjaxResult updatePassword(Map map); - AjaxResult deleteOpenId(int id); + AjaxResult untie(); UserPermission getUserPermission(); } diff --git a/src/main/java/com/soft/line/service/impl/AppletCertificateServiceImpl.java b/src/main/java/com/soft/line/service/impl/AppletCertificateServiceImpl.java index 852892f..fbca0cd 100644 --- a/src/main/java/com/soft/line/service/impl/AppletCertificateServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/AppletCertificateServiceImpl.java @@ -1,11 +1,12 @@ package com.soft.line.service.impl; import com.soft.line.common.AppletSystemConstant; -import com.soft.line.entity.CertificateInfo; +import com.soft.line.entity.AppletCertificate; +import com.soft.line.entity.AttachmentInfo; import com.soft.line.mapper.AppletCertificateMapper; import com.soft.line.mapper.AppletCommonMapper; import com.soft.line.service.AppletCertificateService; -import com.soft.line.util.exception.CommonResult; +import com.soft.line.util.MP.AjaxResult; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -44,7 +45,7 @@ public class AppletCertificateServiceImpl implements AppletCertificateService { private AppletCommonMapper appletCommonMapper; @Override - public CommonResult> getCertificateNum() { + public AjaxResult getCertificateNum() { Map map = new HashMap<>(0); List> mapList = appletCertificateMapper.getCertificateNum(); //查询证书类型 @@ -64,13 +65,13 @@ public class AppletCertificateServiceImpl implements AppletCertificateService { } } else { - return CommonResult.failed("查询证书类型出错"); + return AjaxResult.error("查询证书类型出错"); } - return CommonResult.success(map); + return AjaxResult.success(map); } @Override - public CommonResult>> getCertificateYearList(Map paramMap) { + public AjaxResult getCertificateYearList(Map paramMap) { List> list = new ArrayList<>(); //获取今年字符串 例：2020 @@ -116,11 +117,11 @@ public class AppletCertificateServiceImpl implements AppletCertificateService { } } - return CommonResult.success(list); + return AjaxResult.success(list); } @Override - public CommonResult> getCertificateList(Map paramMap) { + public AjaxResult getCertificateList(Map paramMap) { Map map = new HashMap<>(0); //从第几条开始 @@ -136,16 +137,16 @@ public class AppletCertificateServiceImpl implements AppletCertificateService { map.put("hasMore", i > (num + ((int) paramMap.get("dataNum")))); map.put("certificateList", mapList); - return CommonResult.success(map); + return AjaxResult.success(map); } @Override - public CommonResult> getCertificate(Map paramMap) { + public AjaxResult getCertificate(Map paramMap) { //证书详情 Map certificate = appletCertificateMapper.getCertificate(paramMap); if (certificate == null || certificate.isEmpty()) { - return CommonResult.failed("未查询出结果"); + return AjaxResult.error("未查询出结果"); } //如果值为null 转化为"" @@ -167,31 +168,29 @@ public class AppletCertificateServiceImpl implements AppletCertificateService { certificate.put("attachmentList", annexesList); - return CommonResult.success(certificate); + return AjaxResult.success(certificate); } @Override - public CommonResult updateCertificate(Map paramMap) { - if (appletCertificateMapper.checkCertificateByCertIdAndId((String) paramMap.get(AppletSystemConstant.CERT_ID), (int) paramMap.get(AppletSystemConstant.ID)) != 0) { - return CommonResult.failed("证书编号已存在"); + public AjaxResult updateCertificate(AppletCertificate appletCertificate) { + if (appletCertificateMapper.checkCertificateByCertIdAndId(appletCertificate.getCertId(),appletCertificate.getId ()) != 0) { + return AjaxResult.error("证书编号已存在"); } - if (appletCertificateMapper.updateCertificate(paramMap) != 1) { - return CommonResult.failed("修改证书失败"); + if (appletCertificateMapper.updateCertificate(appletCertificate) != 1) { + return AjaxResult.error("修改证书失败"); } - //对附件的操作 告诉编译器忽略 unchecked 警告信息，如使用List，ArrayList等未进行参数化产生的警告信息。 - @SuppressWarnings("unchecked") - List> annexList = (List>) paramMap.get("deleteAttachmentList"); + List deleteAttachmentList = appletCertificate.getDeleteAttachmentList(); StringBuilder deleteErrorMsg = new StringBuilder(); - if (annexList.size() > 0) { + if (deleteAttachmentList.size() > 0) { //执行删除 - for (Map map : annexList) { + for (AttachmentInfo attachmentInfo : deleteAttachmentList) { //附件表 url - String attachmentUrl = (String) map.get("attachmentUrl"); + String attachmentUrl = attachmentInfo.getAttachmentUrl(); String fileUrl = attachmentUrl.substring(attachmentUrl.indexOf(uploadFileMappingUrl) + 12); //删除附件文件 @@ -202,23 +201,23 @@ public class AppletCertificateServiceImpl implements AppletCertificateService { //deleteErrorMsg += "，删除文件：" + attachmentUrl.substring(attachmentUrl.lastIndexOf("/")) + "失败"; deleteErrorMsg.append("，删除文件：").append(attachmentUrl.substring(attachmentUrl.lastIndexOf("/"))).append("失败"); } else { - appletCommonMapper.delAnnex((int) map.get("id")); + appletCommonMapper.delAnnex(attachmentInfo.getId()); } } } - return CommonResult.success(null, "修改证书成功" + deleteErrorMsg); + return AjaxResult.success("修改证书成功" + deleteErrorMsg); } @Override - public CommonResult deleteCertificate(Map paramMap) { + public AjaxResult deleteCertificate(Map paramMap) { //删除时间 paramMap.put("modifyTime", new Date()); //删除状态 paramMap.put("delFlg", "1"); if (appletCertificateMapper.deleteCertificate(paramMap) != 1) { - return CommonResult.failed("删除合同失败"); + return AjaxResult.error("删除合同失败"); } else { //附件信息 List> oldAttachments = appletCommonMapper.getAnnexes((int) paramMap.get("id"), "2"); @@ -239,12 +238,12 @@ public class AppletCertificateServiceImpl implements AppletCertificateService { } } - return CommonResult.success("删除合同成功"); + return AjaxResult.success(); } } @Override - public CommonResult> getCertificateSearchList(Map paramMap) { + public AjaxResult getCertificateSearchList(Map paramMap) { Map map = new HashMap<>(0); //从第几条开始 @@ -257,26 +256,26 @@ public class AppletCertificateServiceImpl implements AppletCertificateService { //条件下的总个数 map.put("hasMore",appletCertificateMapper.countGetCertificateSearchList(paramMap) > (num+(int) paramMap.get(AppletSystemConstant.DATA_NUM)) ); - return CommonResult.success(map); + return AjaxResult.success(map); } @Override - public CommonResult> addCertificate(CertificateInfo certificateInfo) { + public AjaxResult addCertificate(AppletCertificate appletCertificate) { - if (appletCertificateMapper.checkCertificateByCertId(certificateInfo.getCertId()) != 0) { - return CommonResult.failed("证书编号已存在"); + if (appletCertificateMapper.checkCertificateByCertId(appletCertificate.getCertId()) != 0) { + return AjaxResult.error("证书编号已存在"); } - if(appletCertificateMapper.addCertificate(certificateInfo) == 1){ + if(appletCertificateMapper.addCertificate(appletCertificate) == 1){ Map map = new HashMap<>(0); - map.put("id",certificateInfo.getId()); - return CommonResult.success(map); + map.put("id",appletCertificate.getId()); + return AjaxResult.success(map); } - return CommonResult.failed("添加证书失败"); + return AjaxResult.error(); } @Override - public CommonResult> getCertificateQueryList(Map paramMap) { + public AjaxResult getCertificateQueryList(Map paramMap) { Map map = new HashMap<>(0); //从第几条开始 @@ -288,7 +287,7 @@ public class AppletCertificateServiceImpl implements AppletCertificateService { map.put("certificateList",mapList); map.put("hasMore",appletCertificateMapper.countGetContractQueryList(paramMap) > (num+(int) paramMap.get(AppletSystemConstant.DATA_NUM)) ); - return CommonResult.success(map); + return AjaxResult.success(map); } /** diff --git a/src/main/java/com/soft/line/service/impl/AppletCommonServiceImpl.java b/src/main/java/com/soft/line/service/impl/AppletCommonServiceImpl.java index e1e426b..f754966 100644 --- a/src/main/java/com/soft/line/service/impl/AppletCommonServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/AppletCommonServiceImpl.java @@ -2,7 +2,7 @@ package com.soft.line.service.impl; import com.soft.line.mapper.AppletCommonMapper; import com.soft.line.service.AppletCommonService; -import com.soft.line.util.exception.CommonResult; +import com.soft.line.util.MP.AjaxResult; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; @@ -34,7 +34,7 @@ public class AppletCommonServiceImpl implements AppletCommonService { private AppletCommonMapper appletCommonMapper; @Override - public CommonResult>>> getBaseData() { + public AjaxResult getBaseData() { //返回数据 Map>> map = new HashMap<>(0); @@ -66,14 +66,14 @@ public class AppletCommonServiceImpl implements AppletCommonService { map.put(codeType, listData); } } else { - return CommonResult.failed("枚举数据不存在"); + return AjaxResult.error(); } - return CommonResult.success(map); + return AjaxResult.success(map); } @Override - public CommonResult uploadContractAttach(MultipartFile file, int id, String fileName, String modifyPerson) { + public AjaxResult uploadContractAttach(MultipartFile file, int id, String fileName, String modifyPerson) { File uploadRootFileDir = new File(uploadFileDir); File fileDir = new File(uploadRootFileDir.getAbsolutePath(), "contract/" + id); @@ -102,7 +102,7 @@ public class AppletCommonServiceImpl implements AppletCommonService { } catch (Exception e) { e.printStackTrace(); log.error(e.getMessage(), e); - return CommonResult.failed("上传文件失败"); + return AjaxResult.error("上传文件失败"); } if (!checkName) { @@ -117,14 +117,14 @@ public class AppletCommonServiceImpl implements AppletCommonService { int i = appletCommonMapper.addAnnex(fileName, attachmentUrl, modifyPerson, modifyTime, type, id); //入库是否成功 if (i != 1) { - return CommonResult.failed("文件入库失败，请再次上传"); + return AjaxResult.error("文件入库失败，请再次上传"); } } - return CommonResult.success(null); + return AjaxResult.success(); } @Override - public CommonResult uploadCertificateAttach(MultipartFile file, int id, String fileName, String modifyPerson) { + public AjaxResult uploadCertificateAttach(MultipartFile file, int id, String fileName, String modifyPerson) { File uploadRootFileDir = new File(uploadFileDir); File fileDir = new File(uploadRootFileDir.getAbsolutePath(), "certificate/" + id); @@ -154,7 +154,7 @@ public class AppletCommonServiceImpl implements AppletCommonService { } catch (Exception e) { e.printStackTrace(); log.error(e.getMessage(), e); - return CommonResult.failed("上传文件失败"); + return AjaxResult.error("上传文件失败"); } if (!checkName) { @@ -169,9 +169,9 @@ public class AppletCommonServiceImpl implements AppletCommonService { int i = appletCommonMapper.addAnnex(fileName, attachmentUrl, modifyPerson, modifyTime, type, id); //入库是否成功 if (i != 1) { - return CommonResult.failed("文件入库失败，请再次上传"); + return AjaxResult.error("文件入库失败，请再次上传"); } } - return CommonResult.success(null); + return AjaxResult.success(); } } diff --git a/src/main/java/com/soft/line/service/impl/AppletContractServiceImpl.java b/src/main/java/com/soft/line/service/impl/AppletContractServiceImpl.java index 8edc68d..89d5fc1 100644 --- a/src/main/java/com/soft/line/service/impl/AppletContractServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/AppletContractServiceImpl.java @@ -1,18 +1,20 @@ package com.soft.line.service.impl; import com.soft.line.common.AppletSystemConstant; -import com.soft.line.entity.ContractInfo; +import com.soft.line.entity.AppletContract; +import com.soft.line.entity.AttachmentInfo; import com.soft.line.mapper.AppletCommonMapper; import com.soft.line.mapper.AppletContractMapper; import com.soft.line.service.AppletContractService; +import com.soft.line.util.MP.AjaxResult; import com.soft.line.util.exception.CommonResult; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; -import javax.annotation.Resource; import java.io.File; +import java.math.BigDecimal; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.*; @@ -47,7 +49,7 @@ public class AppletContractServiceImpl implements AppletContractService { private AppletCommonMapper appletCommonMapper; @Override - public CommonResult> getContractNum() { + public AjaxResult getContractNum() { Map map = new HashMap<>(0); List> mapList = appletContractMapper.contractNum(); //查询所有部门 code_detail @@ -64,13 +66,13 @@ public class AppletContractServiceImpl implements AppletContractService { } } } else { - return CommonResult.failed("查询部门出错"); + return AjaxResult.error("查询部门出错"); } - return CommonResult.success(map); + return AjaxResult.success(map); } @Override - public CommonResult>> getContractYearList(Map paraMap) { + public AjaxResult getContractYearList(Map paraMap) { //获取今年字符串 例：2020 String year = getDate("yyyy", new Date()); @@ -118,11 +120,11 @@ public class AppletContractServiceImpl implements AppletContractService { } } - return CommonResult.success(list); + return AjaxResult.success(list); } @Override - public CommonResult> getContractList(Map paraMap) { + public AjaxResult getContractList(Map paraMap) { Map map = new HashMap<>(0); //从第几条开始 int num = ((int) paraMap.get("pageNum") - 1) * ((int) paraMap.get("dataNum")); @@ -137,12 +139,12 @@ public class AppletContractServiceImpl implements AppletContractService { map.put("hasMore", i > (num + ((int) paraMap.get(AppletSystemConstant.DATA_NUM)))); map.put("contractList", mapList); - return CommonResult.success(map); + return AjaxResult.success(map); } @Override - public CommonResult> getContractSearchList(Map paraMap) { + public AjaxResult getContractSearchList(Map paraMap) { Map map = new HashMap<>(0); //从第几条开始 int num = ((int) paraMap.get("pageNum") - 1) * ((int) paraMap.get("dataNum")); @@ -157,11 +159,11 @@ public class AppletContractServiceImpl implements AppletContractService { map.put("hasMore", i > (num + ((int) paraMap.get(AppletSystemConstant.DATA_NUM)))); map.put("contractList", mapList); - return CommonResult.success(map); + return AjaxResult.success(map); } @Override - public CommonResult> getContractQueryList(Map paraMap) { + public AjaxResult getContractQueryList(Map paraMap) { Map map = new HashMap<>(0); //从第几条开始 int num = ((int) paraMap.get("pageNum") - 1) * ((int) paraMap.get("dataNum")); @@ -176,54 +178,53 @@ public class AppletContractServiceImpl implements AppletContractService { map.put("hasMore", i > (num + ((int) paraMap.get(AppletSystemConstant.DATA_NUM)))); map.put("contractList", mapList); - return CommonResult.success(map); + return AjaxResult.success(map); } @Override - public CommonResult> addContract(ContractInfo contractInfo) { - if (appletContractMapper.checkContractByName(contractInfo.getContractName()) != 0) { - return CommonResult.failed("合同已存在"); + public AjaxResult addContract(AppletContract appletContract) { + if (appletContractMapper.checkContractByName(appletContract.getContractName()) != 0) { + return AjaxResult.error("合同已存在"); } //默认不删除 - contractInfo.setDelFlg("0"); + appletContract.setDelFlg("0"); //日期 - contractInfo.setModifyTime(new Date()); + appletContract.setModifyTime(new Date()); - int i = appletContractMapper.addContract(contractInfo); + int i = appletContractMapper.addContract(appletContract); Map map = new HashMap<>(0); if (i == 1) { - map.put("id", contractInfo.getId()); + map.put("id", appletContract.getId()); } else { CommonResult.failed("添加合同失败"); } - return CommonResult.success(map); + return AjaxResult.success(map); } @Override - public CommonResult updateContract(Map paraMap) { - if (appletContractMapper.checkContractByNameAndId(String.valueOf(paraMap.get("contractName")), (int) paraMap.get("id")) != 0) { - return CommonResult.failed("合同已存在"); + public AjaxResult updateContract(AppletContract appletContract) { + if (appletContractMapper.checkContractByNameAndId(appletContract.getContractName(), appletContract.getId()) != 0) { + return AjaxResult.error("合同已存在"); } - paraMap.put("modifyTime", new Date()); - int count = appletContractMapper.updateContract(paraMap); + appletContract.setModifyTime(new Date()); + int count = appletContractMapper.updateContract(appletContract); if (count != 1) { - return CommonResult.failed("修改合同失败"); + return AjaxResult.error("修改合同失败"); } - //对附件的操作 告诉编译器忽略 unchecked 警告信息，如使用List，ArrayList等未进行参数化产生的警告信息。 - @SuppressWarnings("unchecked") - List> annexList = (List>) paraMap.get("deleteAttachmentList"); + + List deleteAttachmentList = appletContract.getDeleteAttachmentList(); StringBuilder deleteErrorMsg = new StringBuilder(); - if (annexList.size() > 0) { + if (deleteAttachmentList.size() > 0) { //执行删除 - for (Map map : annexList) { + for (AttachmentInfo attachmentInfo : deleteAttachmentList) { //附件表 url - String attachmentUrl = (String) map.get("attachmentUrl"); + String attachmentUrl = attachmentInfo.getAttachmentUrl(); String fileUrl = attachmentUrl.substring(attachmentUrl.indexOf(uploadFileMappingUrl) + 12); //删除附件文件 @@ -234,21 +235,21 @@ public class AppletContractServiceImpl implements AppletContractService { //deleteErrorMsg += "，删除文件：" + attachmentUrl.substring(attachmentUrl.lastIndexOf("/")) + "失败"; deleteErrorMsg.append("，删除文件：").append(attachmentUrl.substring(attachmentUrl.lastIndexOf("/"))).append("失败"); } else { - appletCommonMapper.delAnnex((int) map.get("id")); + appletCommonMapper.delAnnex(attachmentInfo.getId()); } } } - return CommonResult.success(null, "修改合同成功" + deleteErrorMsg); + return AjaxResult.success("修改合同成功" + deleteErrorMsg); } @Override - public CommonResult> getContract(Map paraMap) { + public AjaxResult getContract(Map paraMap) { //合同详情 Map map = appletContractMapper.getContract(paraMap); if (map == null || map.isEmpty()) { - return CommonResult.failed("未查询出结果"); + return AjaxResult.error("未查询出结果"); } //如果值为null 转化为"" @@ -257,6 +258,7 @@ public class AppletContractServiceImpl implements AppletContractService { map.put(key,""); } } + map.put("totalAmount",((BigDecimal)map.get("totalAmount")).stripTrailingZeros().toPlainString()); //附件详情 int cId = (int) paraMap.get("id"); @@ -271,7 +273,7 @@ public class AppletContractServiceImpl implements AppletContractService { } map.put("attachmentList", annexesList); - return CommonResult.success(map); + return AjaxResult.success(map); } /** @@ -280,14 +282,14 @@ public class AppletContractServiceImpl implements AppletContractService { * @param paraMap 参数 */ @Override - public CommonResult deleteContract(Map paraMap) { + public AjaxResult deleteContract(Map paraMap) { //删除时间 paraMap.put("modifyTime", new Date()); //删除状态 paraMap.put("delFlg", "1"); int i = appletContractMapper.deleteContract(paraMap); if (i != 1) { - return CommonResult.failed("删除合同失败"); + return AjaxResult.error("删除合同失败"); } else { //附件信息 List> oldAttachments = appletCommonMapper.getAnnexes((int) paraMap.get("id"), "1"); @@ -308,7 +310,7 @@ public class AppletContractServiceImpl implements AppletContractService { } } - return CommonResult.success("删除合同成功"); + return AjaxResult.success(); } } diff --git a/src/main/java/com/soft/line/service/impl/LoginServiceImpl.java b/src/main/java/com/soft/line/service/impl/LoginServiceImpl.java index d2b04f3..ac87d7b 100644 --- a/src/main/java/com/soft/line/service/impl/LoginServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/LoginServiceImpl.java @@ -156,7 +156,7 @@ public class LoginServiceImpl implements LoginService { Map data=new HashMap<>(); UserInfo userInfo= userInfoMapper.getUserInfoByPhoneAndUserNameAndPassword(phone, userName, password); if (userInfo==null) { - return AjaxResult.error("手机或账号或密码错误！"); + return AjaxResult.error("手机或账号密码错误！"); } //获取openId String openId=OpenIdUtil.getOpenId(code); @@ -199,7 +199,6 @@ public class LoginServiceImpl implements LoginService { System.out.println("获取openId失败！"); return AjaxResult.error("获取微信信息失败，请稍后再试！"); } - try { UserInfo userInfo = userInfoMapper.getUserInfoByOpenId(openId); //有token又没有根据此openId查出用户 说明openId变了 此时根据用户id查询绑定用户openId if(userInfo==null) { @@ -207,15 +206,15 @@ public class LoginServiceImpl implements LoginService { userInfo = userInfoMapper.getUserInfoByOpenId(openId); return AjaxResult.success(userInfo); } - }catch (Exception e){ - e.printStackTrace(); - } - return AjaxResult.error(); + return AjaxResult.success(userInfo); } @Override public AjaxResult updatePassword(Map map) { - int result=userInfoMapper.updatePassword(map); + UserTokenDto userTokenDto= HttpRequestUtil.getUserToken(); + int id=userTokenDto.getUserInfo().getId(); + + int result=userInfoMapper.updatePassword(id,(String) map.get("password")); if(result>0){ return AjaxResult.success(); } @@ -223,7 +222,9 @@ public class LoginServiceImpl implements LoginService { } @Override - public AjaxResult deleteOpenId(int id) { + public AjaxResult untie() { + UserTokenDto userTokenDto= HttpRequestUtil.getUserToken(); + int id=userTokenDto.getUserInfo().getId(); int result=userInfoMapper.deleteOpenId(id); if(result>0){ return AjaxResult.success(); -- Gitee From 65b380a4e9ddf2c1a1ef8876cca78e021b397de1 Mon Sep 17 00:00:00 2001 From: wpb <1121178778@qq.com> Date: Wed, 17 Jun 2020 15:57:05 +0800 Subject: [PATCH 116/211] =?UTF-8?q?=E8=BF=87=E6=BB=A4=E5=99=A8=EF=BC=9A?= =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=8E=92=E9=99=A4=E4=B8=8D=E6=8B=A6?= =?UTF-8?q?=E6=88=AA=E7=9A=84=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/soft/line/filter/ConfigurationFilter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/soft/line/filter/ConfigurationFilter.java b/src/main/java/com/soft/line/filter/ConfigurationFilter.java index 9c0c620..b69ccbb 100644 --- a/src/main/java/com/soft/line/filter/ConfigurationFilter.java +++ b/src/main/java/com/soft/line/filter/ConfigurationFilter.java @@ -67,7 +67,7 @@ public class ConfigurationFilter { String auth = request.getHeader("Access-Token"); Token token = null; //if (!uri.contains("/")) { - if (!uri.contains("/") && !uri.contains("/autoLogin") && !uri.contains("/bindUserInfo") && !uri.contains("/uploadContractAttach") && !uri.contains("/uploadCertificateAttach") && !uri.contains("/uploadFiles") ) { + if (!uri.contains("/autoLogin") && !uri.contains("/bindUserInfo") && !uri.contains("/uploadContractAttach") && !uri.contains("/uploadCertificateAttach") && !uri.contains("/uploadFiles") ) { if (auth == null || "".equals(auth)) { if (uri.contains("/file/download/")) { auth = request.getParameter("token"); -- Gitee From 283c108bc8d9aadcfecdaf4ee5b968e56e0e1eca Mon Sep 17 00:00:00 2001 From: wuxueqiao <17625808004@163.com> Date: Wed, 17 Jun 2020 16:39:26 +0800 Subject: [PATCH 117/211] =?UTF-8?q?pom=E5=88=A0=E9=99=A4=E9=87=8D=E5=A4=8D?= =?UTF-8?q?valid=20=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 10 +++++----- softline-files-manage.iml | 1 - src/main/java/com/soft/line/entity/ContractInfo.java | 2 -- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index 3a8a8a3..267aea6 100644 --- a/pom.xml +++ b/pom.xml @@ -195,11 +195,11 @@ 4.5.10 - - javax.validation - validation-api - 1.1.0.Final - + + + + + diff --git a/softline-files-manage.iml b/softline-files-manage.iml index e2737a6..70459be 100644 --- a/softline-files-manage.iml +++ b/softline-files-manage.iml @@ -155,6 +155,5 @@ - \ No newline at end of file diff --git a/src/main/java/com/soft/line/entity/ContractInfo.java b/src/main/java/com/soft/line/entity/ContractInfo.java index b3c5330..af41949 100644 --- a/src/main/java/com/soft/line/entity/ContractInfo.java +++ b/src/main/java/com/soft/line/entity/ContractInfo.java @@ -8,8 +8,6 @@ import lombok.NoArgsConstructor; import org.hibernate.validator.constraints.Length; import javax.validation.constraints.DecimalMin; -import javax.validation.constraints.Digits; -import javax.validation.constraints.Min; import javax.validation.constraints.NotNull; import java.math.BigDecimal; import java.util.Date; -- Gitee From 965c5593cfcf8ef75064a432fc24fec2a8b9a285 Mon Sep 17 00:00:00 2001 From: ljc Date: Wed, 17 Jun 2020 20:45:45 +0800 Subject: [PATCH 118/211] =?UTF-8?q?=E8=8E=B7=E5=8F=96Linux=20IP?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/AttachmentInfoServiceImpl.java | 6 +- .../java/com/soft/line/util/WebToolUtils.java | 74 +++++++++++++++++++ 2 files changed, 78 insertions(+), 2 deletions(-) create mode 100644 src/main/java/com/soft/line/util/WebToolUtils.java diff --git a/src/main/java/com/soft/line/service/impl/AttachmentInfoServiceImpl.java b/src/main/java/com/soft/line/service/impl/AttachmentInfoServiceImpl.java index c14c59b..618396b 100644 --- a/src/main/java/com/soft/line/service/impl/AttachmentInfoServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/AttachmentInfoServiceImpl.java @@ -3,6 +3,7 @@ package com.soft.line.service.impl; import com.soft.line.entity.AttachmentInfo; import com.soft.line.mapper.AttachmentInfoMapper; import com.soft.line.service.AttachMentInfoService; +import com.soft.line.util.WebToolUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; @@ -12,6 +13,7 @@ import org.springframework.web.multipart.MultipartFile; import java.io.File; import java.net.Inet4Address; +import java.net.SocketException; import java.net.UnknownHostException; import java.util.*; @@ -118,8 +120,8 @@ public class AttachmentInfoServiceImpl implements AttachMentInfoService { return "文件入库失败，请再次上传"; }else{ try { - return Inet4Address.getLocalHost().getHostAddress() + ":" + port + context_path + "/" + uploadFileMappingUrl + attachmentInfo.getAttachmentUrl(); - }catch (UnknownHostException e){ + return WebToolUtils.getLocalIP() + ":" + port + context_path + "/" + uploadFileMappingUrl + attachmentInfo.getAttachmentUrl(); + }catch (UnknownHostException | SocketException e){ log.error(e.getMessage(), e); return "上传失败"; } diff --git a/src/main/java/com/soft/line/util/WebToolUtils.java b/src/main/java/com/soft/line/util/WebToolUtils.java new file mode 100644 index 0000000..a6a36e8 --- /dev/null +++ b/src/main/java/com/soft/line/util/WebToolUtils.java @@ -0,0 +1,74 @@ +package com.soft.line.util; + +import java.net.InetAddress; +import java.net.NetworkInterface; +import java.net.SocketException; +import java.net.UnknownHostException; +import java.util.Enumeration; + +public class WebToolUtils { + + public static String getLocalIP() throws UnknownHostException, SocketException { + if (isWindowsOS()) { + return InetAddress.getLocalHost().getHostAddress(); + } else { + return getLinuxLocalIp(); + } + } + + /** + * 判断操作系统是否是Windows + * + * @return + */ + public static boolean isWindowsOS() { + boolean isWindowsOS = false; + String osName = System.getProperty("os.name"); + if (osName.toLowerCase().indexOf("windows") > -1) { + isWindowsOS = true; + } + return isWindowsOS; + } + + /** + * 获取本地Host名称 + */ + public static String getLocalHostName() throws UnknownHostException { + return InetAddress.getLocalHost().getHostName(); + } + + /** + * 获取Linux下的IP地址 + * + * @return IP地址 + * @throws SocketException + */ + private static String getLinuxLocalIp() throws SocketException { + String ip = ""; + try { + for (Enumeration en = NetworkInterface.getNetworkInterfaces(); en.hasMoreElements();) { + NetworkInterface intf = en.nextElement(); + String name = intf.getName(); + if (!name.contains("docker") && !name.contains("lo")) { + for (Enumeration enumIpAddr = intf.getInetAddresses(); enumIpAddr.hasMoreElements();) { + InetAddress inetAddress = enumIpAddr.nextElement(); + if (!inetAddress.isLoopbackAddress()) { + String ipaddress = inetAddress.getHostAddress().toString(); + if (!ipaddress.contains("::") && !ipaddress.contains("0:0:") && !ipaddress.contains("fe80")) { + ip = ipaddress; + System.out.println(ipaddress); + } + } + } + } + } + } catch (SocketException ex) { + System.out.println("获取ip地址异常"); + ip = "127.0.0.1"; + ex.printStackTrace(); + } + System.out.println("IP:"+ip); + return ip; + } + +} -- Gitee From 01929064003edd9ce68c5fd4556d7a6f5452063e Mon Sep 17 00:00:00 2001 From: ljc Date: Wed, 17 Jun 2020 20:48:00 +0800 Subject: [PATCH 119/211] =?UTF-8?q?=E8=8E=B7=E5=8F=96Linux=20IP?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/soft/line/service/impl/AttachmentInfoServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/soft/line/service/impl/AttachmentInfoServiceImpl.java b/src/main/java/com/soft/line/service/impl/AttachmentInfoServiceImpl.java index 618396b..e568871 100644 --- a/src/main/java/com/soft/line/service/impl/AttachmentInfoServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/AttachmentInfoServiceImpl.java @@ -55,11 +55,11 @@ public class AttachmentInfoServiceImpl implements AttachMentInfoService { try { for (AttachmentInfo ainfo : list) { String pathUrl = ainfo.getAttachmentUrl(); - pathUrl = Inet4Address.getLocalHost().getHostAddress() + ":" + port + context_path + "/" + uploadFileMappingUrl + pathUrl; + pathUrl = WebToolUtils.getLocalIP() + ":" + port + context_path + "/" + uploadFileMappingUrl + pathUrl; ainfo.setAttachmentUrl(pathUrl); result.add(ainfo); } - } catch (UnknownHostException e) { + } catch (UnknownHostException | SocketException e) { log.error(e.getMessage(), e); } return result; -- Gitee From 80edada8f641718a542a24c5a733b1459085205e Mon Sep 17 00:00:00 2001 From: wpb <1121178778@qq.com> Date: Thu, 18 Jun 2020 09:15:18 +0800 Subject: [PATCH 120/211] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= =?UTF-8?q?=EF=BC=9A=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0=E5=A4=A7=E5=B0=8F?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index a4f977f..52230f2 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -62,6 +62,6 @@ spring.http.encoding.enabled=true server.tomcat.uri-encoding=UTF-8 ### ļϴ # ֵ֧ļ -spring.servlet.multipart.max-file-size=20MB +spring.servlet.multipart.max-file-size=100MB # ļ spring.servlet.multipart.max-request-size=100MB \ No newline at end of file -- Gitee From b3a692bf0fbaa56fafa8cbd72d2509633408b179 Mon Sep 17 00:00:00 2001 From: wpb <1121178778@qq.com> Date: Thu, 18 Jun 2020 16:04:34 +0800 Subject: [PATCH 121/211] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=EF=BC=9A=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5=E8=BF=94=E5=9B=9E=E7=BB=93=E6=9E=9C=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../soft/line/service/impl/AppletCertificateServiceImpl.java | 2 +- .../com/soft/line/service/impl/AppletContractServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/soft/line/service/impl/AppletCertificateServiceImpl.java b/src/main/java/com/soft/line/service/impl/AppletCertificateServiceImpl.java index fbca0cd..619ebf7 100644 --- a/src/main/java/com/soft/line/service/impl/AppletCertificateServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/AppletCertificateServiceImpl.java @@ -199,7 +199,7 @@ public class AppletCertificateServiceImpl implements AppletCertificateService { if (!deleteResult) { //deleteErrorMsg += "，删除文件：" + attachmentUrl.substring(attachmentUrl.lastIndexOf("/")) + "失败"; - deleteErrorMsg.append("，删除文件：").append(attachmentUrl.substring(attachmentUrl.lastIndexOf("/"))).append("失败"); + deleteErrorMsg.append("，删除文件：").append(attachmentUrl.substring(attachmentUrl.lastIndexOf("/")+1)).append("失败"); } else { appletCommonMapper.delAnnex(attachmentInfo.getId()); } diff --git a/src/main/java/com/soft/line/service/impl/AppletContractServiceImpl.java b/src/main/java/com/soft/line/service/impl/AppletContractServiceImpl.java index 89d5fc1..d17fe7b 100644 --- a/src/main/java/com/soft/line/service/impl/AppletContractServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/AppletContractServiceImpl.java @@ -233,7 +233,7 @@ public class AppletContractServiceImpl implements AppletContractService { if (!deleteResult) { //deleteErrorMsg += "，删除文件：" + attachmentUrl.substring(attachmentUrl.lastIndexOf("/")) + "失败"; - deleteErrorMsg.append("，删除文件：").append(attachmentUrl.substring(attachmentUrl.lastIndexOf("/"))).append("失败"); + deleteErrorMsg.append("，删除文件：").append(attachmentUrl.substring(attachmentUrl.lastIndexOf("/")+1)).append("失败"); } else { appletCommonMapper.delAnnex(attachmentInfo.getId()); } -- Gitee From c64111b2f30e94ef5af7a2d70babfb612a54de7b Mon Sep 17 00:00:00 2001 From: ljc <1119265069@qq.com> Date: Thu, 18 Jun 2020 23:35:21 +0800 Subject: [PATCH 122/211] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../line/controller/StatisticsController.java | 36 ++++++++++++ .../line/mapper/CertAttachInfoMapper.java | 30 ---------- .../soft/line/mapper/CertAttachInfoMapper.xml | 38 ------------ .../line/mapper/CertificateInfoMapper.java | 7 +++ .../line/mapper/CertificateInfoMapper.xml | 23 ++++++++ .../line/mapper/ContAttachInfoMapper.java | 30 ---------- .../soft/line/mapper/ContAttachInfoMapper.xml | 38 ------------ .../soft/line/mapper/ContractInfoMapper.java | 32 +++++----- .../soft/line/mapper/ContractInfoMapper.xml | 23 ++++++++ .../soft/line/service/StatisticsService.java | 12 ++++ .../service/impl/StatisticsServiceImpl.java | 58 +++++++++++++++++++ 11 files changed, 173 insertions(+), 154 deletions(-) create mode 100644 src/main/java/com/soft/line/controller/StatisticsController.java delete mode 100644 src/main/java/com/soft/line/mapper/CertAttachInfoMapper.java delete mode 100644 src/main/java/com/soft/line/mapper/CertAttachInfoMapper.xml delete mode 100644 src/main/java/com/soft/line/mapper/ContAttachInfoMapper.java delete mode 100644 src/main/java/com/soft/line/mapper/ContAttachInfoMapper.xml create mode 100644 src/main/java/com/soft/line/service/StatisticsService.java create mode 100644 src/main/java/com/soft/line/service/impl/StatisticsServiceImpl.java diff --git a/src/main/java/com/soft/line/controller/StatisticsController.java b/src/main/java/com/soft/line/controller/StatisticsController.java new file mode 100644 index 0000000..f5ed304 --- /dev/null +++ b/src/main/java/com/soft/line/controller/StatisticsController.java @@ -0,0 +1,36 @@ +package com.soft.line.controller; + +import com.soft.line.service.StatisticsService; +import com.soft.line.util.exception.CommonResult; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.Map; + +@Api(description = "统计接口") +@Slf4j +@RequestMapping("/statistics") +@RestController +public class StatisticsController { + + @Autowired + private StatisticsService statisticsService; + + @ApiOperation(value = "统计合同", notes = "统计合同") + @PostMapping("/contracts") + public CommonResult statisticsForContract(@RequestBody Map map){ + return CommonResult.success(statisticsService.statisticsForContract(map)); + } + + @ApiOperation(value = "统计证书", notes = "统计证书") + @PostMapping("/certificates") + public CommonResult statisticsForCertificate(@RequestBody Map map){ + return CommonResult.success(statisticsService.statisticsForCertificate(map)); + } +} diff --git a/src/main/java/com/soft/line/mapper/CertAttachInfoMapper.java b/src/main/java/com/soft/line/mapper/CertAttachInfoMapper.java deleted file mode 100644 index ddfa1b8..0000000 --- a/src/main/java/com/soft/line/mapper/CertAttachInfoMapper.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.soft.line.mapper; - -import com.soft.line.entity.CertAttachInfo; -import java.util.List; - -public interface CertAttachInfoMapper { - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table cert_attach_info - * - * @mbggenerated - */ - int insert(CertAttachInfo record); - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table cert_attach_info - * - * @mbggenerated - */ - CertAttachInfo selectByPrimaryKey(Integer id); - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table cert_attach_info - * - * @mbggenerated - */ - List selectAll(); -} \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/CertAttachInfoMapper.xml b/src/main/java/com/soft/line/mapper/CertAttachInfoMapper.xml deleted file mode 100644 index 36cbe97..0000000 --- a/src/main/java/com/soft/line/mapper/CertAttachInfoMapper.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - insert into `cert_attach_info` (`cert_id`, `attach_id`) - values (#{certId,jdbcType=INTEGER}, #{attachId,jdbcType=INTEGER}) - - - - \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/CertificateInfoMapper.java b/src/main/java/com/soft/line/mapper/CertificateInfoMapper.java index 78d4b99..de78ad9 100644 --- a/src/main/java/com/soft/line/mapper/CertificateInfoMapper.java +++ b/src/main/java/com/soft/line/mapper/CertificateInfoMapper.java @@ -30,4 +30,11 @@ public interface CertificateInfoMapper { int countCertificateByIdAndCId(@Param("id")Integer id,@Param("certId")String certId); List getAllByIdList(@Param("idList")List idList); + + //根据年份分组查询数量 + List> countNumGroupByYear(); + + //根据部门分组查询数量 + List> countNumGroupByCertType(); + } \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/CertificateInfoMapper.xml b/src/main/java/com/soft/line/mapper/CertificateInfoMapper.xml index eb3a1c2..e9991dd 100644 --- a/src/main/java/com/soft/line/mapper/CertificateInfoMapper.xml +++ b/src/main/java/com/soft/line/mapper/CertificateInfoMapper.xml @@ -130,4 +130,27 @@ + + + + \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/ContAttachInfoMapper.java b/src/main/java/com/soft/line/mapper/ContAttachInfoMapper.java deleted file mode 100644 index d7c3693..0000000 --- a/src/main/java/com/soft/line/mapper/ContAttachInfoMapper.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.soft.line.mapper; - -import com.soft.line.entity.ContAttachInfo; -import java.util.List; - -public interface ContAttachInfoMapper { - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table cont_attach_info - * - * @mbggenerated - */ - int insert(ContAttachInfo record); - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table cont_attach_info - * - * @mbggenerated - */ - ContAttachInfo selectByPrimaryKey(Integer id); - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table cont_attach_info - * - * @mbggenerated - */ - List selectAll(); -} \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/ContAttachInfoMapper.xml b/src/main/java/com/soft/line/mapper/ContAttachInfoMapper.xml deleted file mode 100644 index d8a2114..0000000 --- a/src/main/java/com/soft/line/mapper/ContAttachInfoMapper.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - insert into `cont_attach_info` (`cont_id`, `attach_id`) - values (#{contId,jdbcType=INTEGER}, #{attachId,jdbcType=INTEGER}) - - - - \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/ContractInfoMapper.java b/src/main/java/com/soft/line/mapper/ContractInfoMapper.java index 876a344..77c2f15 100644 --- a/src/main/java/com/soft/line/mapper/ContractInfoMapper.java +++ b/src/main/java/com/soft/line/mapper/ContractInfoMapper.java @@ -7,12 +7,7 @@ import java.util.List; import java.util.Map; public interface ContractInfoMapper { - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table contract_info - * - * @mbggenerated - */ + int insert(ContractInfo contractInfo); int insertRecord(ContractInfo record); @@ -21,20 +16,8 @@ public interface ContractInfoMapper { int update(ContractInfo contractInfo); - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table contract_info - * - * @mbggenerated - */ ContractInfo selectByPrimaryKey(Integer id); - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table contract_info - * - * @mbggenerated - */ List selectAll(Map map); @@ -43,4 +26,17 @@ public interface ContractInfoMapper { int countContractByIdAndName(@Param("id")Integer id,@Param("contractName")String contractName); List getAllByIdList(@Param("idList")List idList); + + //根据年份分组查询数量 + List> countNumGroupByYear(); + + //根据部门分组查询数量 + List> countNumGroupByDep(); + + //根据年份分组查询总金额 + List> countAmountGroupByYear(); + + //根据部门分组查询总金额 + List> countAmountGroupByDep(); + } \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml b/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml index 2af3e45..d1b7b5f 100644 --- a/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml +++ b/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml @@ -168,4 +168,27 @@ + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/soft/line/service/StatisticsService.java b/src/main/java/com/soft/line/service/StatisticsService.java new file mode 100644 index 0000000..7a0f642 --- /dev/null +++ b/src/main/java/com/soft/line/service/StatisticsService.java @@ -0,0 +1,12 @@ +package com.soft.line.service; + +import java.util.List; +import java.util.Map; + +public interface StatisticsService { + + public List> statisticsForContract(Map map); + + public List> statisticsForCertificate(Map map); + +} diff --git a/src/main/java/com/soft/line/service/impl/StatisticsServiceImpl.java b/src/main/java/com/soft/line/service/impl/StatisticsServiceImpl.java new file mode 100644 index 0000000..cb98dc7 --- /dev/null +++ b/src/main/java/com/soft/line/service/impl/StatisticsServiceImpl.java @@ -0,0 +1,58 @@ +package com.soft.line.service.impl; + +import com.soft.line.mapper.CertificateInfoMapper; +import com.soft.line.mapper.ContractInfoMapper; +import com.soft.line.service.StatisticsService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +@Service +@Slf4j +public class StatisticsServiceImpl implements StatisticsService { + + @Autowired + private ContractInfoMapper contractInfoMapper; + @Autowired + private CertificateInfoMapper certificateInfoMapper; + + @Override + public List> statisticsForContract(Map map) { + String x = (String)map.get("x"); + String y = (String)map.get("y"); + List> resultList = new ArrayList>(); + if (y.equals("数量")){ + if(x.equals("年份")){ + resultList = contractInfoMapper.countNumGroupByYear(); + }else if (x.equals("部门")){ + resultList = contractInfoMapper.countNumGroupByDep(); + } + }else if(y.equals("金额")){ + if(x.equals("年份")){ + resultList = contractInfoMapper.countAmountGroupByYear(); + }else if (x.equals("部门")){ + resultList = contractInfoMapper.countAmountGroupByDep(); + } + } + return resultList; + } + + @Override + public List> statisticsForCertificate(Map map) { + String x = (String)map.get("x"); + String y = (String)map.get("y"); + List> resultList = new ArrayList>(); + if (y.equals("数量")){ + if(x.equals("年份")){ + resultList = certificateInfoMapper.countNumGroupByYear(); + }else if (x.equals("类型")){ + resultList = certificateInfoMapper.countNumGroupByCertType(); + } + } + return resultList; + } +} -- Gitee From c10beba01b6ed4ca194d587773679d431c9dffe9 Mon Sep 17 00:00:00 2001 From: ljc Date: Fri, 19 Jun 2020 15:24:05 +0800 Subject: [PATCH 123/211] =?UTF-8?q?=E8=AF=81=E4=B9=A6=E6=B7=BB=E5=8A=A0del?= =?UTF-8?q?Flg?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/soft/line/entity/CertAttachInfo.java | 99 ------------------- .../com/soft/line/entity/CertificateInfo.java | 1 + .../com/soft/line/entity/ContAttachInfo.java | 99 ------------------- 3 files changed, 1 insertion(+), 198 deletions(-) delete mode 100644 src/main/java/com/soft/line/entity/CertAttachInfo.java delete mode 100644 src/main/java/com/soft/line/entity/ContAttachInfo.java diff --git a/src/main/java/com/soft/line/entity/CertAttachInfo.java b/src/main/java/com/soft/line/entity/CertAttachInfo.java deleted file mode 100644 index 72dff26..0000000 --- a/src/main/java/com/soft/line/entity/CertAttachInfo.java +++ /dev/null @@ -1,99 +0,0 @@ -package com.soft.line.entity; - -public class CertAttachInfo { - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column cert_attach_info.id - * - * @mbggenerated - */ - private Integer id; - - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column cert_attach_info.cert_id - * - * @mbggenerated - */ - private Integer certId; - - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column cert_attach_info.attach_id - * - * @mbggenerated - */ - private Integer attachId; - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column cert_attach_info.id - * - * @return the value of cert_attach_info.id - * - * @mbggenerated - */ - public Integer getId() { - return id; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column cert_attach_info.id - * - * @param id the value for cert_attach_info.id - * - * @mbggenerated - */ - public void setId(Integer id) { - this.id = id; - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column cert_attach_info.cert_id - * - * @return the value of cert_attach_info.cert_id - * - * @mbggenerated - */ - public Integer getCertId() { - return certId; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column cert_attach_info.cert_id - * - * @param certId the value for cert_attach_info.cert_id - * - * @mbggenerated - */ - public void setCertId(Integer certId) { - this.certId = certId; - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column cert_attach_info.attach_id - * - * @return the value of cert_attach_info.attach_id - * - * @mbggenerated - */ - public Integer getAttachId() { - return attachId; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column cert_attach_info.attach_id - * - * @param attachId the value for cert_attach_info.attach_id - * - * @mbggenerated - */ - public void setAttachId(Integer attachId) { - this.attachId = attachId; - } -} \ No newline at end of file diff --git a/src/main/java/com/soft/line/entity/CertificateInfo.java b/src/main/java/com/soft/line/entity/CertificateInfo.java index 82737b6..37be2d2 100644 --- a/src/main/java/com/soft/line/entity/CertificateInfo.java +++ b/src/main/java/com/soft/line/entity/CertificateInfo.java @@ -61,5 +61,6 @@ public class CertificateInfo { @JsonFormat(pattern = "yyyy-MM-dd",timezone = "Asia/Shanghai") private Date modifyTime; + private String delFlg; } \ No newline at end of file diff --git a/src/main/java/com/soft/line/entity/ContAttachInfo.java b/src/main/java/com/soft/line/entity/ContAttachInfo.java deleted file mode 100644 index 931ad8a..0000000 --- a/src/main/java/com/soft/line/entity/ContAttachInfo.java +++ /dev/null @@ -1,99 +0,0 @@ -package com.soft.line.entity; - -public class ContAttachInfo { - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column cont_attach_info.id - * - * @mbggenerated - */ - private Integer id; - - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column cont_attach_info.cont_id - * - * @mbggenerated - */ - private Integer contId; - - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column cont_attach_info.attach_id - * - * @mbggenerated - */ - private Integer attachId; - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column cont_attach_info.id - * - * @return the value of cont_attach_info.id - * - * @mbggenerated - */ - public Integer getId() { - return id; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column cont_attach_info.id - * - * @param id the value for cont_attach_info.id - * - * @mbggenerated - */ - public void setId(Integer id) { - this.id = id; - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column cont_attach_info.cont_id - * - * @return the value of cont_attach_info.cont_id - * - * @mbggenerated - */ - public Integer getContId() { - return contId; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column cont_attach_info.cont_id - * - * @param contId the value for cont_attach_info.cont_id - * - * @mbggenerated - */ - public void setContId(Integer contId) { - this.contId = contId; - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column cont_attach_info.attach_id - * - * @return the value of cont_attach_info.attach_id - * - * @mbggenerated - */ - public Integer getAttachId() { - return attachId; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column cont_attach_info.attach_id - * - * @param attachId the value for cont_attach_info.attach_id - * - * @mbggenerated - */ - public void setAttachId(Integer attachId) { - this.attachId = attachId; - } -} \ No newline at end of file -- Gitee From 4e13a0869884a5da4c8998f15800a09e34c558c9 Mon Sep 17 00:00:00 2001 From: ljc Date: Fri, 19 Jun 2020 15:24:13 +0800 Subject: [PATCH 124/211] =?UTF-8?q?=E8=AF=81=E4=B9=A6=E6=B7=BB=E5=8A=A0del?= =?UTF-8?q?Flg?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- softline-files-manage.iml | 159 -------------------------------------- 1 file changed, 159 deletions(-) delete mode 100644 softline-files-manage.iml diff --git a/softline-files-manage.iml b/softline-files-manage.iml deleted file mode 100644 index 70459be..0000000 --- a/softline-files-manage.iml +++ /dev/null @@ -1,159 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file -- Gitee From 0ed385b8e3d476e93711b81dc06315f4d3565a4b Mon Sep 17 00:00:00 2001 From: matabiri <1119265069@qq.com> Date: Fri, 19 Jun 2020 15:32:58 +0800 Subject: [PATCH 125/211] =?UTF-8?q?=E6=B7=BB=E5=8A=A0softline-files-manage?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- softline-files-manage.iml | 157 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 157 insertions(+) create mode 100644 softline-files-manage.iml diff --git a/softline-files-manage.iml b/softline-files-manage.iml new file mode 100644 index 0000000..337a58b --- /dev/null +++ b/softline-files-manage.iml @@ -0,0 +1,157 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file -- Gitee From 4dceb6c4e7bb319e6d8c0b615828f40efa9dbbbd Mon Sep 17 00:00:00 2001 From: ljc <1119265069@qq.com> Date: Sun, 21 Jun 2020 12:12:15 +0800 Subject: [PATCH 126/211] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E7=AE=A1=E7=90=86=20?= =?UTF-8?q?=E9=83=A8=E9=97=A8=E3=80=81=E8=AF=81=E4=B9=A6=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E8=BD=AC=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/soft/line/mapper/CertificateInfoMapper.xml | 2 +- src/main/java/com/soft/line/mapper/ContractInfoMapper.xml | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/soft/line/mapper/CertificateInfoMapper.xml b/src/main/java/com/soft/line/mapper/CertificateInfoMapper.xml index e9991dd..4f6fc54 100644 --- a/src/main/java/com/soft/line/mapper/CertificateInfoMapper.xml +++ b/src/main/java/com/soft/line/mapper/CertificateInfoMapper.xml @@ -145,7 +145,7 @@ @@ -187,7 +188,8 @@ -- Gitee From 59db2c3881e7bf1e9a1e577a0c35370272016bc6 Mon Sep 17 00:00:00 2001 From: ljc Date: Tue, 23 Jun 2020 10:23:58 +0800 Subject: [PATCH 127/211] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=88=E5=90=8C?= =?UTF-8?q?=E9=87=91=E9=A2=9D=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/soft/line/mapper/ContractInfoMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml b/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml index cf89c64..3c69bd1 100644 --- a/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml +++ b/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml @@ -182,14 +182,14 @@ -- Gitee From 4032aca11a513a8795bab9f513f53e886ab83774 Mon Sep 17 00:00:00 2001 From: ljc Date: Tue, 23 Jun 2020 11:17:47 +0800 Subject: [PATCH 128/211] =?UTF-8?q?=E8=AF=81=E4=B9=A6=E5=90=88=E5=90=8C?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BF=AE=E6=94=B9=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CertificateInfoController.java | 4 +--- .../controller/ContractInfoController.java | 5 +--- .../com/soft/line/entity/CertificateInfo.java | 6 ++--- .../com/soft/line/entity/ContractInfo.java | 10 ++++---- .../impl/CertificateInfoServiceImpl.java | 23 ++++++++++++++++--- .../service/impl/ContractInfoServiceImpl.java | 23 ++++++++++++++++--- 6 files changed, 50 insertions(+), 21 deletions(-) diff --git a/src/main/java/com/soft/line/controller/CertificateInfoController.java b/src/main/java/com/soft/line/controller/CertificateInfoController.java index f6d205c..04411bf 100644 --- a/src/main/java/com/soft/line/controller/CertificateInfoController.java +++ b/src/main/java/com/soft/line/controller/CertificateInfoController.java @@ -86,9 +86,7 @@ public class CertificateInfoController { if (certificateInfoService.countByCId(certificateInfo.getId(), certificateInfo.getCertId()) > 0) { return CommonResult.success("存在相同证书编号"); } - Date beginDate = StringToDateUtil.convert(certificateInfo.getBeginDate().toString()); - Date endDate = StringToDateUtil.convert(certificateInfo.getEndDate().toString()); - if (beginDate.after(endDate)) { + if (certificateInfo.getBeginDate().after(certificateInfo.getEndDate())) { return CommonResult.failed("起始日期不能>终止日期"); } if (certificateInfo.getId() == null) { diff --git a/src/main/java/com/soft/line/controller/ContractInfoController.java b/src/main/java/com/soft/line/controller/ContractInfoController.java index c425925..e5e8af7 100644 --- a/src/main/java/com/soft/line/controller/ContractInfoController.java +++ b/src/main/java/com/soft/line/controller/ContractInfoController.java @@ -61,10 +61,7 @@ public class ContractInfoController { return CommonResult.success("存在相同合同名称"); } - - Date beginDate = StringToDateUtil.convert(contractInfo.getBeginDate().toString()); - Date endDate =StringToDateUtil.convert(contractInfo.getEndDate().toString()); - if (beginDate.after(endDate)){ + if (contractInfo.getBeginDate().after(contractInfo.getEndDate())){ return CommonResult.success("起始日期不能>终止日期"); } if (contractInfo.getId()==null){ diff --git a/src/main/java/com/soft/line/entity/CertificateInfo.java b/src/main/java/com/soft/line/entity/CertificateInfo.java index 37be2d2..e9c1b48 100644 --- a/src/main/java/com/soft/line/entity/CertificateInfo.java +++ b/src/main/java/com/soft/line/entity/CertificateInfo.java @@ -45,12 +45,12 @@ public class CertificateInfo { @ApiModelProperty(value = "发证日期") @NotNull(message = "发证日期不能为空") - @JsonFormat(pattern = "yyyy-MM-dd",timezone = "Asia/Shanghai") + @JsonFormat(pattern = "yyyyMMdd",timezone = "Asia/Shanghai") private Date beginDate; @ApiModelProperty(value = "到期日期") @NotNull(message = "到期日期不能为空") - @JsonFormat(pattern = "yyyy-MM-dd",timezone = "Asia/Shanghai") + @JsonFormat(pattern = "yyyyMMdd",timezone = "Asia/Shanghai") private Date endDate; @Length(max = 200,message="备注不能大于200位") @@ -58,7 +58,7 @@ public class CertificateInfo { private String modifyPerson; - @JsonFormat(pattern = "yyyy-MM-dd",timezone = "Asia/Shanghai") + @JsonFormat(pattern = "yyyyMMdd",timezone = "Asia/Shanghai") private Date modifyTime; private String delFlg; diff --git a/src/main/java/com/soft/line/entity/ContractInfo.java b/src/main/java/com/soft/line/entity/ContractInfo.java index af41949..2cb5a6d 100644 --- a/src/main/java/com/soft/line/entity/ContractInfo.java +++ b/src/main/java/com/soft/line/entity/ContractInfo.java @@ -34,7 +34,7 @@ public class ContractInfo { @ApiModelProperty(value = "总金额") @NotNull(message = "总金额不能为空") - @DecimalMin("10000") + //@DecimalMin("10000") private BigDecimal totalAmount; @ApiModelProperty(value = "第一签约方") @@ -49,7 +49,7 @@ public class ContractInfo { @ApiModelProperty(value = "签约日期") @NotNull(message = "签约日期不能为空") - @JsonFormat(pattern = "yyyy-MM-dd",timezone = "Asia/Shanghai") + @JsonFormat(pattern = "yyyyMMdd",timezone = "Asia/Shanghai") private Date signTime; @ApiModelProperty(value = "签约地点") @@ -59,12 +59,12 @@ public class ContractInfo { @ApiModelProperty(value = "开始时间") @NotNull(message = "开始时间不能为空") - @JsonFormat(pattern = "yyyy-MM-dd",timezone = "Asia/Shanghai") + @JsonFormat(pattern = "yyyyMMdd",timezone = "Asia/Shanghai") private Date beginDate; @ApiModelProperty(value = "结束时间") @NotNull(message = "结束时间不能为空") - @JsonFormat(pattern = "yyyy-MM-dd",timezone = "Asia/Shanghai") + @JsonFormat(pattern = "yyyyMMdd",timezone = "Asia/Shanghai") private Date endDate; @ApiModelProperty(value = "支付方式") @@ -77,7 +77,7 @@ public class ContractInfo { private String modifyPerson; - @JsonFormat(pattern = "yyyy-MM-dd",timezone = "Asia/Shanghai") + @JsonFormat(pattern = "yyyyMMdd",timezone = "Asia/Shanghai") private Date modifyTime; private String delFlg; diff --git a/src/main/java/com/soft/line/service/impl/CertificateInfoServiceImpl.java b/src/main/java/com/soft/line/service/impl/CertificateInfoServiceImpl.java index 9881f12..026ebb7 100644 --- a/src/main/java/com/soft/line/service/impl/CertificateInfoServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/CertificateInfoServiceImpl.java @@ -2,6 +2,8 @@ package com.soft.line.service.impl; import com.github.pagehelper.PageInfo; import com.soft.line.entity.CertificateInfo; +import com.soft.line.filter.HttpRequestUtil; +import com.soft.line.filter.UserTokenDto; import com.soft.line.mapper.AttachmentInfoMapper; import com.soft.line.mapper.CertificateInfoMapper; import com.soft.line.service.CertificateInfoService; @@ -64,21 +66,36 @@ public class CertificateInfoServiceImpl implements CertificateInfoService { @Override public void add(CertificateInfo certificateInfo) { - certificateInfo.setModifyPerson("admin"); + String userName="admin"; + UserTokenDto userToken=HttpRequestUtil.getUserToken(); + if(userToken!=null){ + userName=userToken.getUserInfo().getUserName(); + } + certificateInfo.setModifyPerson(userName); certificateInfoMapper.insert(certificateInfo); } @Override public void update(CertificateInfo certificateInfo) { - certificateInfo.setModifyPerson("admin"); + String userName="admin"; + UserTokenDto userToken=HttpRequestUtil.getUserToken(); + if(userToken!=null){ + userName=userToken.getUserInfo().getUserName(); + } + certificateInfo.setModifyPerson(userName); certificateInfo.setModifyTime(new Date()); certificateInfoMapper.update(certificateInfo); } @Override public void insertRecord(List list) { + String userName="admin"; + UserTokenDto userToken=HttpRequestUtil.getUserToken(); + if(userToken!=null){ + userName=userToken.getUserInfo().getUserName(); + } for(CertificateInfo record:list){ - record.setModifyPerson("admin"); + record.setModifyPerson(userName); record.setModifyTime(new Date()); certificateInfoMapper.insertRecord(record); } diff --git a/src/main/java/com/soft/line/service/impl/ContractInfoServiceImpl.java b/src/main/java/com/soft/line/service/impl/ContractInfoServiceImpl.java index 8f2530c..ec0d101 100644 --- a/src/main/java/com/soft/line/service/impl/ContractInfoServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/ContractInfoServiceImpl.java @@ -2,6 +2,8 @@ package com.soft.line.service.impl; import com.github.pagehelper.PageInfo; import com.soft.line.entity.ContractInfo; +import com.soft.line.filter.HttpRequestUtil; +import com.soft.line.filter.UserTokenDto; import com.soft.line.mapper.AttachmentInfoMapper; import com.soft.line.mapper.ContractInfoMapper; import com.soft.line.service.ContractInfoService; @@ -53,21 +55,36 @@ public class ContractInfoServiceImpl implements ContractInfoService{ @Override public void add(ContractInfo contractInfo) { - contractInfo.setModifyPerson("admin"); + String userName="admin"; + UserTokenDto userToken= HttpRequestUtil.getUserToken(); + if(userToken!=null){ + userName=userToken.getUserInfo().getUserName(); + } + contractInfo.setModifyPerson(userName); contractInfoMapper.insert(contractInfo); } @Override public void update(ContractInfo contractInfo) { - contractInfo.setModifyPerson("admin"); + String userName="admin"; + UserTokenDto userToken= HttpRequestUtil.getUserToken(); + if(userToken!=null){ + userName=userToken.getUserInfo().getUserName(); + } + contractInfo.setModifyPerson(userName); contractInfo.setModifyTime(new Date()); contractInfoMapper.update(contractInfo); } @Override public void insertList(List list) { + String userName="admin"; + UserTokenDto userToken= HttpRequestUtil.getUserToken(); + if(userToken!=null){ + userName=userToken.getUserInfo().getUserName(); + } for (ContractInfo record:list){ - record.setModifyPerson("admin"); + record.setModifyPerson(userName); record.setModifyTime(new Date()); contractInfoMapper.insertRecord(record); } -- Gitee From c966365f51bdb49c407f831c10c2e2ce4159a573 Mon Sep 17 00:00:00 2001 From: ljc Date: Tue, 23 Jun 2020 11:18:21 +0800 Subject: [PATCH 129/211] =?UTF-8?q?=E7=99=BB=E9=99=86=E8=AE=A4=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/soft/line/filter/ConfigurationFilter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/soft/line/filter/ConfigurationFilter.java b/src/main/java/com/soft/line/filter/ConfigurationFilter.java index b69ccbb..25234e4 100644 --- a/src/main/java/com/soft/line/filter/ConfigurationFilter.java +++ b/src/main/java/com/soft/line/filter/ConfigurationFilter.java @@ -67,7 +67,7 @@ public class ConfigurationFilter { String auth = request.getHeader("Access-Token"); Token token = null; //if (!uri.contains("/")) { - if (!uri.contains("/autoLogin") && !uri.contains("/bindUserInfo") && !uri.contains("/uploadContractAttach") && !uri.contains("/uploadCertificateAttach") && !uri.contains("/uploadFiles") ) { + if (!uri.contains("/login")&&!uri.contains("/autoLogin") && !uri.contains("/bindUserInfo") && !uri.contains("/uploadContractAttach") && !uri.contains("/uploadCertificateAttach") && !uri.contains("/uploadFiles") ) { if (auth == null || "".equals(auth)) { if (uri.contains("/file/download/")) { auth = request.getParameter("token"); -- Gitee From 2229add74f031bf1f255876515005e5c71282a56 Mon Sep 17 00:00:00 2001 From: wpb <1121178778@qq.com> Date: Tue, 23 Jun 2020 16:11:30 +0800 Subject: [PATCH 130/211] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=EF=BC=9A?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=8E=92=E5=BA=8F=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/soft/line/mapper/AppletCertificateMapper.xml | 2 +- src/main/java/com/soft/line/mapper/AppletContractMapper.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/soft/line/mapper/AppletCertificateMapper.xml b/src/main/java/com/soft/line/mapper/AppletCertificateMapper.xml index 3abf905..f2c1450 100644 --- a/src/main/java/com/soft/line/mapper/AppletCertificateMapper.xml +++ b/src/main/java/com/soft/line/mapper/AppletCertificateMapper.xml @@ -40,7 +40,7 @@ AND SUBSTR(begin_date, 1, 4) < '2005' ORDER BY - begin_date DESC + begin_date DESC ,id LIMIT #{pageNum},#{dataNum} diff --git a/src/main/java/com/soft/line/mapper/AppletContractMapper.xml b/src/main/java/com/soft/line/mapper/AppletContractMapper.xml index 62b1996..77a2dab 100644 --- a/src/main/java/com/soft/line/mapper/AppletContractMapper.xml +++ b/src/main/java/com/soft/line/mapper/AppletContractMapper.xml @@ -29,7 +29,7 @@ and SUBSTR(sign_time,1,4) < '2005' - order by modify_time desc + order by modify_time desc,id limit #{pageNum}, #{dataNum} -- Gitee From f2efc26a1c8220a38c152238d1fede27af9056bb Mon Sep 17 00:00:00 2001 From: wpb <1121178778@qq.com> Date: Tue, 23 Jun 2020 16:15:22 +0800 Subject: [PATCH 131/211] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=EF=BC=9A?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=8E=92=E5=BA=8F=E5=86=B2=E7=AA=81=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/soft/line/mapper/AppletCertificateMapper.xml | 4 ++-- src/main/java/com/soft/line/mapper/AppletContractMapper.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/soft/line/mapper/AppletCertificateMapper.xml b/src/main/java/com/soft/line/mapper/AppletCertificateMapper.xml index f2c1450..5a1cee7 100644 --- a/src/main/java/com/soft/line/mapper/AppletCertificateMapper.xml +++ b/src/main/java/com/soft/line/mapper/AppletCertificateMapper.xml @@ -132,7 +132,7 @@ and cert_name like concat('%',#{certName},'%') - ORDER BY modify_time desc + ORDER BY modify_time desc,id LIMIT #{pageNum},#{dataNum} @@ -215,7 +215,7 @@ and SUBSTR(end_date,1,11) <= #{endDate} - ORDER BY modify_time desc + ORDER BY modify_time desc,id LIMIT #{pageNum},#{dataNum} diff --git a/src/main/java/com/soft/line/mapper/AppletContractMapper.xml b/src/main/java/com/soft/line/mapper/AppletContractMapper.xml index 77a2dab..605ac49 100644 --- a/src/main/java/com/soft/line/mapper/AppletContractMapper.xml +++ b/src/main/java/com/soft/line/mapper/AppletContractMapper.xml @@ -52,7 +52,7 @@ and contract_name like concat('%',#{contractName},'%') - order by modify_time desc + order by modify_time desc,id limit #{pageNum}, #{dataNum} @@ -99,7 +99,7 @@ and total_amount >= #{minTotalAmount} - order by modify_time desc + order by modify_time desc,id limit #{pageNum}, #{dataNum} -- Gitee From ec3fe087c3aa8dfc47eb221ad000b333a457f4e7 Mon Sep 17 00:00:00 2001 From: ljc Date: Tue, 23 Jun 2020 17:11:49 +0800 Subject: [PATCH 132/211] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E8=85=BE=E8=AE=AF?= =?UTF-8?q?=E4=BA=91=E5=A4=96=E7=BD=91ip?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tencentcloudapi/DescribeInstances.java | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 src/main/java/com/soft/line/util/tencentcloudapi/DescribeInstances.java diff --git a/src/main/java/com/soft/line/util/tencentcloudapi/DescribeInstances.java b/src/main/java/com/soft/line/util/tencentcloudapi/DescribeInstances.java new file mode 100644 index 0000000..0a0b250 --- /dev/null +++ b/src/main/java/com/soft/line/util/tencentcloudapi/DescribeInstances.java @@ -0,0 +1,39 @@ +package com.soft.line.util.tencentcloudapi; + +import com.tencentcloudapi.common.Credential; +import com.tencentcloudapi.common.profile.ClientProfile; +import com.tencentcloudapi.common.profile.HttpProfile; +import com.tencentcloudapi.common.exception.TencentCloudSDKException; + +import com.tencentcloudapi.cvm.v20170312.CvmClient; + +import com.tencentcloudapi.cvm.v20170312.models.DescribeInstancesRequest; +import com.tencentcloudapi.cvm.v20170312.models.DescribeInstancesResponse; + +public class DescribeInstances { + + public static void getDescribeInstances() { + try{ + + Credential cred = new Credential("AKIDC8sCF3GpnUu3uUqtf9STJtBH6i24uJUN", "astgDdmeGcJioijJbleIejX4JK4YlkSu"); + + HttpProfile httpProfile = new HttpProfile(); + httpProfile.setEndpoint("cvm.tencentcloudapi.com"); + + ClientProfile clientProfile = new ClientProfile(); + clientProfile.setHttpProfile(httpProfile); + + CvmClient client = new CvmClient(cred, "ap-shanghai", clientProfile); + + String params = "{}"; + DescribeInstancesRequest req = DescribeInstancesRequest.fromJsonString(params, DescribeInstancesRequest.class); + + DescribeInstancesResponse resp = client.DescribeInstances(req); + + System.out.println(DescribeInstancesRequest.toJsonString(resp)); + } catch (TencentCloudSDKException e) { + System.out.println(e.toString()); + } + + } +} -- Gitee From 2e196234d7ef0c3583d352a06c316d54956a1036 Mon Sep 17 00:00:00 2001 From: ljc Date: Wed, 24 Jun 2020 15:48:00 +0800 Subject: [PATCH 133/211] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=8E=E7=AB=AF?= =?UTF-8?q?=E5=90=88=E5=90=8C=E9=87=91=E9=A2=9D=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/soft/line/mapper/CertificateInfoMapper.xml | 9 ++++----- .../java/com/soft/line/mapper/ContractInfoMapper.xml | 9 ++++----- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/soft/line/mapper/CertificateInfoMapper.xml b/src/main/java/com/soft/line/mapper/CertificateInfoMapper.xml index 4f6fc54..e0e31b8 100644 --- a/src/main/java/com/soft/line/mapper/CertificateInfoMapper.xml +++ b/src/main/java/com/soft/line/mapper/CertificateInfoMapper.xml @@ -93,7 +93,7 @@ @@ -101,7 +101,7 @@ select `id`, `cert_id`, `cert_type`, `cert_name`,`project_name`, `cert_unit`, `begin_date`, `end_date`, `note`, `modify_person`, `modify_time`, `del_flg` from `certificate_info` - WHERE 1=1 + WHERE 1=1 and `del_flg`!='1' and instr(`cert_type`,#{certType,jdbcType=VARCHAR})>0 @@ -109,7 +109,7 @@ select count(*) from `contract_info` - WHERE `contract_name` = #{contractName} + WHERE `contract_name` = #{contractName} and `del_flg`!='1' AND `id` ]]> #{id,jdbcType=INTEGER} @@ -158,14 +158,13 @@ `begin_date`, `end_date`,`payment`, `note`, `modify_person`, `modify_time`, `del_flg` from `contract_info` - + where `del_flg`!='1' and `id` in #{id} - select `id`, `name`,`state`,`modify_person`,`modify_time` from `role_info` - + where `state`='1' - name like concat('%', #{roleName} ,'%') + and name like concat('%', #{roleName} ,'%') - diff --git a/src/main/java/com/soft/line/mapper/UserInfoMapper.java b/src/main/java/com/soft/line/mapper/UserInfoMapper.java index f167caf..95cc61c 100644 --- a/src/main/java/com/soft/line/mapper/UserInfoMapper.java +++ b/src/main/java/com/soft/line/mapper/UserInfoMapper.java @@ -85,4 +85,6 @@ public interface UserInfoMapper { int updatePassword(int id,String password); int deleteOpenId(int id); + + int countByRoleId(int roleId); } \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/UserInfoMapper.xml b/src/main/java/com/soft/line/mapper/UserInfoMapper.xml index 623c1dc..d207069 100644 --- a/src/main/java/com/soft/line/mapper/UserInfoMapper.xml +++ b/src/main/java/com/soft/line/mapper/UserInfoMapper.xml @@ -135,4 +135,10 @@ WHERE `id`=#{id} + + \ No newline at end of file diff --git a/src/main/java/com/soft/line/service/UserInfoService.java b/src/main/java/com/soft/line/service/UserInfoService.java index 006ccab..a40bf79 100644 --- a/src/main/java/com/soft/line/service/UserInfoService.java +++ b/src/main/java/com/soft/line/service/UserInfoService.java @@ -22,4 +22,6 @@ public interface UserInfoService { Boolean changePassword(Map map); + int countByRoleId(Integer roleId); + } diff --git a/src/main/java/com/soft/line/service/impl/UserInfoServiceImpl.java b/src/main/java/com/soft/line/service/impl/UserInfoServiceImpl.java index ceba75c..8e1d7b0 100644 --- a/src/main/java/com/soft/line/service/impl/UserInfoServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/UserInfoServiceImpl.java @@ -79,5 +79,8 @@ public class UserInfoServiceImpl implements UserInfoService { return false; } - + @Override + public int countByRoleId(Integer roleId) { + return userInfoMapper.countByRoleId(roleId); + } } -- Gitee From bd61cb67ad560350b91e6eed217ba1c39b8708c2 Mon Sep 17 00:00:00 2001 From: wpb <1121178778@qq.com> Date: Mon, 29 Jun 2020 14:27:22 +0800 Subject: [PATCH 137/211] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=EF=BC=9A?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=EF=BC=8C=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E5=AF=86=E7=A0=81=E7=BD=AE=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/soft/line/mapper/UserInfoMapper.xml | 2 +- src/main/java/com/soft/line/service/impl/LoginServiceImpl.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/soft/line/mapper/UserInfoMapper.xml b/src/main/java/com/soft/line/mapper/UserInfoMapper.xml index 623c1dc..3a00b21 100644 --- a/src/main/java/com/soft/line/mapper/UserInfoMapper.xml +++ b/src/main/java/com/soft/line/mapper/UserInfoMapper.xml @@ -99,7 +99,7 @@ WHERE `id`=#{id,jdbcType=INTEGER} + + + + + + \ No newline at end of file diff --git a/src/main/java/com/soft/line/service/StatisticsService.java b/src/main/java/com/soft/line/service/StatisticsService.java index 7a0f642..fa027ad 100644 --- a/src/main/java/com/soft/line/service/StatisticsService.java +++ b/src/main/java/com/soft/line/service/StatisticsService.java @@ -9,4 +9,7 @@ public interface StatisticsService { public List> statisticsForCertificate(Map map); + public List> amountRankingForContract(); + + public List> depRankingForContract(); } diff --git a/src/main/java/com/soft/line/service/impl/StatisticsServiceImpl.java b/src/main/java/com/soft/line/service/impl/StatisticsServiceImpl.java index cb98dc7..27a5878 100644 --- a/src/main/java/com/soft/line/service/impl/StatisticsServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/StatisticsServiceImpl.java @@ -55,4 +55,16 @@ public class StatisticsServiceImpl implements StatisticsService { } return resultList; } + + @Override + public List> amountRankingForContract() { + return contractInfoMapper.amountRanking(); + } + + @Override + public List> depRankingForContract() { + return contractInfoMapper.depRanking(); + } + + } -- Gitee From bfd99d4a7a9dee2097859a969af88aa28665e885 Mon Sep 17 00:00:00 2001 From: ljc <1119265069@qq.com> Date: Mon, 19 Oct 2020 20:35:41 +0800 Subject: [PATCH 141/211] =?UTF-8?q?resources=E8=AE=BE=E7=BD=AE=E4=B8=BAjav?= =?UTF-8?q?a-resource?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- softline-files-manage.iml | 1 + 1 file changed, 1 insertion(+) diff --git a/softline-files-manage.iml b/softline-files-manage.iml index 337a58b..5aacf43 100644 --- a/softline-files-manage.iml +++ b/softline-files-manage.iml @@ -19,6 +19,7 @@ + -- Gitee From 425e29480a71dce17503d96f66aa18bd9454bdf6 Mon Sep 17 00:00:00 2001 From: ljc <1119265069@qq.com> Date: Mon, 19 Oct 2020 21:07:42 +0800 Subject: [PATCH 142/211] =?UTF-8?q?=E5=90=88=E5=90=8C=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E2=80=9C=E5=90=88=E5=90=8C=E7=B1=BB=E5=9E=8B=E2=80=9D=EF=BC=9B?= =?UTF-8?q?=20=E7=94=A8=E6=88=B7=E6=B7=BB=E5=8A=A0=E2=80=9C=E9=83=A8?= =?UTF-8?q?=E9=97=A8=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/soft/line/entity/ContractInfo.java | 4 ++++ .../java/com/soft/line/entity/UserInfo.java | 3 +++ .../soft/line/mapper/ContractInfoMapper.xml | 22 ++++++++++++------- .../com/soft/line/mapper/UserInfoMapper.xml | 21 +++++++++++------- 4 files changed, 34 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/soft/line/entity/ContractInfo.java b/src/main/java/com/soft/line/entity/ContractInfo.java index 2cb5a6d..f5b21f8 100644 --- a/src/main/java/com/soft/line/entity/ContractInfo.java +++ b/src/main/java/com/soft/line/entity/ContractInfo.java @@ -82,4 +82,8 @@ public class ContractInfo { private String delFlg; + @ApiModelProperty(value = "合同类型") + @NotNull(message = "合同类型不能为空") + private String contractType; + } \ No newline at end of file diff --git a/src/main/java/com/soft/line/entity/UserInfo.java b/src/main/java/com/soft/line/entity/UserInfo.java index 6420d83..8b58b5f 100644 --- a/src/main/java/com/soft/line/entity/UserInfo.java +++ b/src/main/java/com/soft/line/entity/UserInfo.java @@ -50,5 +50,8 @@ public class UserInfo { private String openId; + @ApiModelProperty(value = "部门ID") + @NotNull(message = "部门ID为空") + private String depId; } \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml b/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml index 7c75715..8606d71 100644 --- a/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml +++ b/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml @@ -22,6 +22,7 @@ + @@ -29,13 +30,13 @@ `total_amount`, `part_a`, `part_b`, `sign_time`, `sign_addr`, `begin_date`, `end_date`, `payment`, `note`, - `modify_person` + `modify_person`,`contract_type` ) values (#{depId,jdbcType=VARCHAR}, #{contractName,jdbcType=VARCHAR}, #{proId,jdbcType=VARCHAR}, #{totalAmount,jdbcType=DECIMAL}, #{partA,jdbcType=VARCHAR}, #{partB,jdbcType=VARCHAR}, #{signTime,jdbcType=TIMESTAMP}, #{signAddr,jdbcType=VARCHAR}, #{beginDate,jdbcType=TIMESTAMP}, #{endDate,jdbcType=TIMESTAMP}, #{payment,jdbcType=VARCHAR}, #{note,jdbcType=VARCHAR}, - #{modifyPerson,jdbcType=VARCHAR} + #{modifyPerson,jdbcType=VARCHAR},#{contractType,jdbcType=VARCHAR} ) @@ -44,13 +45,13 @@ `total_amount`, `part_a`, `part_b`, `sign_time`, `sign_addr`, `begin_date`, `end_date`, `payment`, `note`, - `modify_person` + `modify_person`,`contract_type` ) values (#{depId,jdbcType=VARCHAR}, #{contractName,jdbcType=VARCHAR}, #{proId,jdbcType=VARCHAR}, #{totalAmount,jdbcType=DECIMAL}, #{partA,jdbcType=VARCHAR}, #{partB,jdbcType=VARCHAR}, #{signTime,jdbcType=TIMESTAMP}, #{signAddr,jdbcType=VARCHAR}, #{beginDate,jdbcType=TIMESTAMP}, #{endDate,jdbcType=TIMESTAMP}, #{payment,jdbcType=VARCHAR}, #{note,jdbcType=VARCHAR}, - #{modifyPerson,jdbcType=VARCHAR} + #{modifyPerson,jdbcType=VARCHAR},#{contractType,jdbcType=VARCHAR} ) @@ -71,6 +72,7 @@ `end_date` = #{endDate,jdbcType=TIMESTAMP}, `payment` = #{payment,jdbcType=VARCHAR}, `note` = #{note,jdbcType=VARCHAR}, + `contract_type` = #{contractType,jdbcType=VARCHAR}, `modify_person` = #{modifyPerson,jdbcType=VARCHAR}, `modify_time` = #{modifyTime,jdbcType=TIMESTAMP} where `id` = #{id,jdbcType=INTEGER} @@ -83,7 +85,7 @@ --> select `id`, `dep_id`, `contract_name`, `pro_id`, `total_amount`, `part_a`, `part_b`, `sign_time`, `sign_addr`, `begin_date`, `end_date`, `payment`, `note`, `modify_person`, - `modify_time`, `del_flg` + `modify_time`, `del_flg`,`contract_type` from `contract_info` where `id` = #{id,jdbcType=INTEGER} @@ -91,7 +93,7 @@ @@ -48,7 +49,7 @@ This element is automatically generated by MyBatis Generator, do not modify. --> select `id`, `user_name`, `password`, `phone`, `modify_person`, `modify_time`, `head_img_url`, - `user_status`, `role_id`, `salt`, `open_id` + `user_status`, `role_id`, `salt`, `open_id`,`dep_id` from `user_info` @@ -58,7 +59,7 @@ This element is automatically generated by MyBatis Generator, do not modify. --> select `id`, `user_name`, `password`, `phone`, `modify_person`, `modify_time`, `head_img_url`, - `user_status`, `role_id`, `salt`, `open_id` + `user_status`, `role_id`, `salt`, `open_id`,`dep_id` from `user_info` WHERE `user_name`=#{username,jdbcType=VARCHAR} @@ -67,7 +68,7 @@ DELETE FROM `user_info` @@ -94,20 +98,21 @@ `modify_person`=#{modifyPerson,jdbcType=VARCHAR}, `head_img_url`=#{headImgUrl,jdbcType=VARCHAR}, `user_status`=#{userStatus,jdbcType=VARCHAR}, + `dep_id`=#{depId,jdbcType=INTEGER}, `role_id`=#{roleId,jdbcType=INTEGER} WHERE `id`=#{id,jdbcType=INTEGER} select count(*) from contract_info t - where SUBSTR(begin_date, 1,4)='2020' and del_flg != 1 + where SUBSTR(begin_date, 1,4)=YEAR(NOW()) and del_flg != 1 group by SUBSTR(begin_date, 1, 4) @@ -217,4 +217,5 @@ from contract_info t where del_flg=0 group by t.dep_id order by total desc LIMIT 0,6 + \ No newline at end of file diff --git a/src/main/java/com/soft/line/util/tencentcloudapi/DescribeInstances.java b/src/main/java/com/soft/line/util/tencentcloudapi/DescribeInstances.java deleted file mode 100644 index 0a0b250..0000000 --- a/src/main/java/com/soft/line/util/tencentcloudapi/DescribeInstances.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.soft.line.util.tencentcloudapi; - -import com.tencentcloudapi.common.Credential; -import com.tencentcloudapi.common.profile.ClientProfile; -import com.tencentcloudapi.common.profile.HttpProfile; -import com.tencentcloudapi.common.exception.TencentCloudSDKException; - -import com.tencentcloudapi.cvm.v20170312.CvmClient; - -import com.tencentcloudapi.cvm.v20170312.models.DescribeInstancesRequest; -import com.tencentcloudapi.cvm.v20170312.models.DescribeInstancesResponse; - -public class DescribeInstances { - - public static void getDescribeInstances() { - try{ - - Credential cred = new Credential("AKIDC8sCF3GpnUu3uUqtf9STJtBH6i24uJUN", "astgDdmeGcJioijJbleIejX4JK4YlkSu"); - - HttpProfile httpProfile = new HttpProfile(); - httpProfile.setEndpoint("cvm.tencentcloudapi.com"); - - ClientProfile clientProfile = new ClientProfile(); - clientProfile.setHttpProfile(httpProfile); - - CvmClient client = new CvmClient(cred, "ap-shanghai", clientProfile); - - String params = "{}"; - DescribeInstancesRequest req = DescribeInstancesRequest.fromJsonString(params, DescribeInstancesRequest.class); - - DescribeInstancesResponse resp = client.DescribeInstances(req); - - System.out.println(DescribeInstancesRequest.toJsonString(resp)); - } catch (TencentCloudSDKException e) { - System.out.println(e.toString()); - } - - } -} -- Gitee From 5ce93e05bd2b9438132752f1db2c983e88d116e0 Mon Sep 17 00:00:00 2001 From: ljc Date: Fri, 30 Oct 2020 17:08:56 +0800 Subject: [PATCH 144/211] =?UTF-8?q?=E5=90=88=E5=90=8C=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=EF=BC=8C=E4=BB=8A=E5=B9=B4=E9=83=A8=E9=97=A8=E5=90=88=E5=90=8C?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- softline-files-manage.iml | 158 ------------------ .../line/controller/StatisticsController.java | 6 + .../soft/line/mapper/ContractInfoMapper.java | 3 + .../soft/line/mapper/ContractInfoMapper.xml | 7 + .../soft/line/service/StatisticsService.java | 2 + .../service/impl/StatisticsServiceImpl.java | 5 + 6 files changed, 23 insertions(+), 158 deletions(-) delete mode 100644 softline-files-manage.iml diff --git a/softline-files-manage.iml b/softline-files-manage.iml deleted file mode 100644 index 5aacf43..0000000 --- a/softline-files-manage.iml +++ /dev/null @@ -1,158 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/java/com/soft/line/controller/StatisticsController.java b/src/main/java/com/soft/line/controller/StatisticsController.java index 932bb55..74e8f23 100644 --- a/src/main/java/com/soft/line/controller/StatisticsController.java +++ b/src/main/java/com/soft/line/controller/StatisticsController.java @@ -34,6 +34,12 @@ public class StatisticsController { return CommonResult.success(statisticsService.statisticsForCertificate(map)); } + @ApiOperation(value = "年部门合同统计", notes = "年部门合同统计") + @PostMapping("/contracts/countNumGroupByDepThisYear") + public CommonResult countNumGroupByDepThisYear(@RequestBody Map map){ + return CommonResult.success(statisticsService.countNumGroupByDepThisYear(map)); + } + @ApiOperation(value = "合同总金额排行榜", notes = "合同总金额排行榜") @PostMapping("/contracts/amountRanking") public CommonResult amountRankingForContract(){ diff --git a/src/main/java/com/soft/line/mapper/ContractInfoMapper.java b/src/main/java/com/soft/line/mapper/ContractInfoMapper.java index 558c433..7ed5c0c 100644 --- a/src/main/java/com/soft/line/mapper/ContractInfoMapper.java +++ b/src/main/java/com/soft/line/mapper/ContractInfoMapper.java @@ -33,6 +33,9 @@ public interface ContractInfoMapper { //根据部门分组查询数量 List> countNumGroupByDep(); + //根据部门分组查询数量(今年) + List> countNumGroupByDepThisYear(); + //根据年份分组查询总金额 List> countAmountGroupByYear(); diff --git a/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml b/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml index ebe24a6..19f2dc5 100644 --- a/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml +++ b/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml @@ -187,6 +187,13 @@ GROUP BY `dep_id` + + + + + + + select + cert_type certType , COUNT(cert_type) num + from certificate_info + where + del_flg != 1 + GROUP BY cert_type + + + + + + + + + + + + UPDATE certificate_info + SET cert_id = #{certId}, + cert_type = #{certType}, + cert_name = #{certName}, + project_name = #{projectName}, + cert_unit = #{certUnit}, + begin_date = #{beginDate}, + end_date = #{endDate}, + + note = #{note}, + + modify_person = #{modifyPerson}, + modify_time = NOW() + WHERE + id = #{id} + + + + + + update certificate_info + set modify_person = #{modifyPerson}, + modify_time = #{modifyTime}, + del_flg = #{delFlg} + where id = #{id} + + + + + + + + INSERT INTO certificate_info ( + cert_id, + cert_type, + cert_name, + project_name, + cert_unit, + begin_date, + end_date, + + note, + + modify_person, + modify_time, + del_flg + ) + VALUES + ( + #{certId}, + #{certType}, + #{certName}, + #{projectName}, + #{certUnit}, + #{beginDate}, + #{endDate}, + + #{note}, + + #{modifyPerson}, + NOW(), + 0 + ) + + + + + + + + + \ No newline at end of file diff --git a/target/classes/com/soft/line/mapper/AppletCommonMapper.class b/target/classes/com/soft/line/mapper/AppletCommonMapper.class new file mode 100644 index 0000000000000000000000000000000000000000..e4b2be6cd60c7def1edd72fcfc0820fa50e00368 GIT binary patch literal 1191 zcmb7DOK;Oa5T14OCT-IM2<1&_)#QRN9FT%4RjrULrBIR5Q!g8P>uzQ5TK1-D{~8B= z06z-xc@yG@1gRWGJ2N|v@0*?d`Rn@+B6?4IReD>cT}JD^4#crATt+86Vbt#Rhu8du zyAvZLcPKM6U{oK;P;oO!1tV`M;NwC9YRt@ttI!>pRH|?=4OsLX3=U9tqiCLYVzk>^ z4qbt#bt24_4o-Q>V_`&^F{=`o2KO(Io!&7w zVg+}v?}0iuhWl5sQ06m8;2{dfw=`nZjCCL{?@qx^D@Ki}c_#DNlCebBd@o?M^L3&O z+~+cr<4DYh0v_6MBelYK_J%qQU7nz&aOD{8%;iOZYqKzb@(qtB=+Fp-v4aqKa?e}l zx#C$a?i2T4+wx_6EqsGrv5ymoX!bazo*kki!N2*(Jzb&B?A?m}?VmGRlL3hI{=QpW z15X(diWIH#gvLluQeS+M5vI{SOp-{LBOS+DVZ{@XzRN!eqkUh;Zl*7d8%ZVH*xtFz z;fz}LSJ^)>WmRFs$iZ(Us+53`O0dhY9BWsp2CWXe3^e&+uO1+@N$az#?Fwzcy$NYS zwjgat2l5bdR6)r{kjEL~=IUmlwhDEtP}_ytLBB3N0lXYa-LbXv9#c5mwolhtNGQ}c ea-Y&OIA%1S6T$U@UKY$=%}c#T+#6U9?feF#VKq?z literal 0 HcmV?d00001 diff --git a/target/classes/com/soft/line/mapper/AppletCommonMapper.xml b/target/classes/com/soft/line/mapper/AppletCommonMapper.xml new file mode 100644 index 0000000..3dbf951 --- /dev/null +++ b/target/classes/com/soft/line/mapper/AppletCommonMapper.xml @@ -0,0 +1,44 @@ + + + + + + + + + + insert into attachment_info( + attachment_name,attachment_url,modify_person,modify_time,type,c_id + )value ( + #{attachmentName},#{attachmentUrl},#{modifyPerson},#{modifyTime},#{type},#{cId} + ) + + + + + + delete from attachment_info where id = #{id} + + + + delete from attachment_info where id in + + #{id} + + + + \ No newline at end of file diff --git a/target/classes/com/soft/line/mapper/AppletContractMapper.class b/target/classes/com/soft/line/mapper/AppletContractMapper.class new file mode 100644 index 0000000000000000000000000000000000000000..36eae86fe22cd9358eea6abb3238143ff02c3321 GIT binary patch literal 1612 zcmb7ETW=CU6h4Ec6seR#f!1qVt$-T$#Rn6N37Tj~XtiQYd>nR1*t+a)c4wRL;t%t| zAK;HNetRim3O7x^ePZ?EI%ajgR<(W5URPXji7yObd zp41Ixq`R`us65uECYPQg7`FDOPA36k@kp=lRevBGZA>T&1 zzY6a7$rv4V({TM9KDARJXO{MnJA5vra9l_jikh&88lx>2Q~0dUF@)n!z{Bl}?&=dmEE_Q} zO-pjATP9j^GP0bh!fme3grZNNb`>5wC_xnX7B9Ks0koOmJ;prLS;(}VVxP1$b87Gz zZ!cF0^I^1?06zDGvj}lpDcppio|$0Z$9$PlUU#ert#D1dS~N!8?nt%fifet7ilLiA z5oo1cCi4Sx-Ym|73GL@-2d3t4T`MA-+|!{ykb(~D&9UV+^`Jr4sI)q)2oNEm)tn~abT&lXX2gV7DzfLw%BpiRgn+QO|2xd=x7Utp@h zw7uSRi>gsnxj;LJsNwA5v9+Ho5?xOU-Epx$2uBcFT# literal 0 HcmV?d00001 diff --git a/target/classes/com/soft/line/mapper/AppletContractMapper.xml b/target/classes/com/soft/line/mapper/AppletContractMapper.xml new file mode 100644 index 0000000..605ac49 --- /dev/null +++ b/target/classes/com/soft/line/mapper/AppletContractMapper.xml @@ -0,0 +1,211 @@ + + + + + + + + + + + + + + + + + + + + + + insert into `contract_info` (`dep_id`, `contract_name`, `pro_id`, + `total_amount`, `part_a`, `part_b`, + `sign_time`, `sign_addr`, `begin_date`, + `end_date`, `payment`, + + `note`, + + `modify_person`, `modify_time`, `del_flg` + ) + values (#{depId,jdbcType=VARCHAR}, #{contractName,jdbcType=VARCHAR}, #{proId,jdbcType=VARCHAR}, + #{totalAmount,jdbcType=DECIMAL}, #{partA,jdbcType=VARCHAR}, #{partB,jdbcType=VARCHAR}, + #{signTime,jdbcType=TIMESTAMP}, #{signAddr,jdbcType=VARCHAR}, #{beginDate,jdbcType=TIMESTAMP}, + #{endDate,jdbcType=TIMESTAMP}, #{payment,jdbcType=VARCHAR}, + + #{note,jdbcType=VARCHAR}, + + #{modifyPerson,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}, #{delFlg,jdbcType=CHAR} + ) + + + + + UPDATE contract_info set + dep_id = #{depId} , + contract_name = #{contractName} , + pro_id = #{proId} , + total_amount = #{totalAmount} , + part_a = #{partA} , + part_b = #{partB} , + sign_time = #{signTime} , + sign_addr = #{signAddr} , + begin_date = #{beginDate} , + end_date = #{endDate} , + payment = #{payment} , + + note = #{note} , + + modify_person = #{modifyPerson} , + modify_time = #{modifyTime} + where id = #{id} + + + + + + update contract_info set modify_person = #{modifyPerson} , del_flg = #{delFlg} , modify_time = #{modifyTime} where id = #{id} + + + + + + + \ No newline at end of file diff --git a/target/classes/com/soft/line/mapper/AttachmentInfoMapper.class b/target/classes/com/soft/line/mapper/AttachmentInfoMapper.class new file mode 100644 index 0000000000000000000000000000000000000000..5ba63c1b5edabb97b1f42a51f1c3527e97db0f48 GIT binary patch literal 1220 zcmbVL%Wl&^6upx+4GFZQ0a^;>RjE?4VKxX5sVb!lq=*!%2C<{k#F@HN+2d$DuH;{1 z!3XeBh~sf&=OLA-i;+Ed?mg$+*Pp+?eiP98ogn(p>!;bWz=pDyeQ;xbZL2@ zwB%A-WmDd>R(Mw-Zhd_jbvu1V%~NTwqVbt9B9vB|7%)b9ks0G>ECbja-nF<9JP_LF zLu-`wyMxlw*H-${IJ_-UaC}cEh+XsgfI2u&AR&}LRIEmUEa-Y#M^;!BX%HU{BI9#0 zfkw&I2gD=9q&!A>FbB+dHW)8nrgBu4LVXP#!!nd#0{ z^2`9`NI&m{w0a7SVU!q8W>dsyZ+=BEF%xOtW_4xMncpc45#APdDi6SDmfMj}%LXHK z7W+z6TgO(=I__26s@O9km}+zn4wMKc*)o>5e1arKixcK$=JF{g3<^J)e)=FW6q(7P}7-FP*4Y{{RcWMkxRQ literal 0 HcmV?d00001 diff --git a/target/classes/com/soft/line/mapper/AttachmentInfoMapper.xml b/target/classes/com/soft/line/mapper/AttachmentInfoMapper.xml new file mode 100644 index 0000000..7830d8d --- /dev/null +++ b/target/classes/com/soft/line/mapper/AttachmentInfoMapper.xml @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + insert into `attachment_info` (`attachment_name`, `attachment_url`, `modify_person`, + `modify_time`,`type`,`c_id`) + values (#{attachmentName,jdbcType=VARCHAR}, #{attachmentUrl,jdbcType=VARCHAR}, #{modifyPerson,jdbcType=VARCHAR}, + #{modifyTime,jdbcType=TIMESTAMP},#{type,jdbcType=VARCHAR},#{cId,jdbcType=INTEGER}) + + + + delete from `attachment_info` where `type` = #{attachmentType} and `c_id` = #{cId} + + + + delete from `attachment_info` where `type` = #{type} and `c_id` = #{cId} and `attachment_name` = #{attachmentName} + + + + delete from `attachment_info` where `type` = #{type} and `c_id` = #{cId} and `id` = #{id} + + + + + + + + + \ No newline at end of file diff --git a/target/classes/com/soft/line/mapper/ButtonInfoMapper.class b/target/classes/com/soft/line/mapper/ButtonInfoMapper.class new file mode 100644 index 0000000000000000000000000000000000000000..3c43bf50698cd10a88f990f57b8835dc84f88d39 GIT binary patch literal 890 zcmbVKOG`pQ6h31<(q3kn)uKfZ*rwSO1V*5XNKgueHmycI-bUum$lSStf2~D7pdS?- z@AcIKk`}|9=Xbt2^Syt(z5&1`9B1G#14j(90V?des!|LJ<@3fsj06vzRJ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/target/classes/com/soft/line/mapper/CertificateInfoMapper.class b/target/classes/com/soft/line/mapper/CertificateInfoMapper.class new file mode 100644 index 0000000000000000000000000000000000000000..0907e37cd2305f70fb2b6608030fb8a5a6c70331 GIT binary patch literal 1661 zcmbVMTTc@~6h2d+P((mb5yT4!*rKv8KA4n{0EwotU<1a)Co^n^GGupVGdoMNf6WJf zfIrIk?S*!`qE;U!yL0B8?|kR_{m0jDMD&_=Ch6rQy<$|ADip>tYSi1V_MK3lTgQ`1 zI6_%zW9JaB@?5&yik3Rp%|?sS{E@I1y4&G~`@#wnGMaOT^%%`$$S1cOol2=ZFU>^q9{BMzvGfQ`|-dYHvzvyP1{8RnIxKMyg)3Ao*~1DO}s! zOTns9&;@U}3gOeW2XV(ppPTr-hzGzaQd$7roY5>SKK+A_3F zM!KXkY9J+~-O)(y!Q*UC*bd60757q_8##qy@@`-{6`?1NQCmjs5iI_J(J~l;$)WZG zuHr&(p@mjl9VuIo9mK8fzUm&fknDPqM@w1J6Q)@Ayc3e{tR}6P*sPxbPx|7M4CR?8 z`t7=}l(yVTt>AUDtxeD20e3HiBhMfX9X?QSQY++g;);6_5|ZQ;5hUD_y24AbtZAul z$Y@pO+F#1r#V)vx3*GzwMPE$QcpUlfjE;hX__N?98MZPcVru;&%-LLzWRct-W-aNp zrIOpEjvwOy8Jj-Uk#WUa>EW_csBf}QF!zBlJISyxS{^RgP@T5^Ql|_EM7D?581@Mq zl-F3MjZKzLX*v$s=BP5lcw0ef01LEu6Tn>n+@t%0r=>pj13WGN-fD#&=2o=|!3VA4Ji=M3!1rUE zCn4nh-&Mdpr8UHxN3q`b^enZTN%E50twVW(HX+F3+`|2N@ebE@*jK1Q+xS+Y`GV*t Dpx4FQ literal 0 HcmV?d00001 diff --git a/target/classes/com/soft/line/mapper/CertificateInfoMapper.xml b/target/classes/com/soft/line/mapper/CertificateInfoMapper.xml new file mode 100644 index 0000000..ce9c88a --- /dev/null +++ b/target/classes/com/soft/line/mapper/CertificateInfoMapper.xml @@ -0,0 +1,156 @@ + + + + + + + + + + + + + + + + + + + + insert into `certificate_info` (`cert_id`, `cert_type`, `cert_name`, + `project_name`,`cert_unit`, `begin_date`, `end_date`, + `note`, `modify_person`) + values (#{certId,jdbcType=VARCHAR}, #{certType,jdbcType=VARCHAR}, #{certName,jdbcType=VARCHAR}, + #{projectName,jdbcType=VARCHAR},#{certUnit,jdbcType=VARCHAR}, #{beginDate,jdbcType=TIMESTAMP}, #{endDate,jdbcType=TIMESTAMP}, + #{note,jdbcType=VARCHAR}, #{modifyPerson,jdbcType=VARCHAR}) + + + + insert into `certificate_info` (`cert_id`, `cert_type`, `cert_name`, + `project_name`,`cert_unit`, `begin_date`, `end_date`, + `note`, `modify_person`) + values (#{certId,jdbcType=VARCHAR}, #{certType,jdbcType=VARCHAR}, #{certName,jdbcType=VARCHAR}, + #{projectName,jdbcType=VARCHAR},#{certUnit,jdbcType=VARCHAR}, #{beginDate,jdbcType=TIMESTAMP}, #{endDate,jdbcType=TIMESTAMP}, + #{note,jdbcType=VARCHAR}, #{modifyPerson,jdbcType=VARCHAR}) + + + + update `certificate_info` set `del_flg` = '1' where `id` = #{id,jdbcType=INTEGER} + + + + update `certificate_info` set `cert_id` = #{certId,jdbcType=VARCHAR}, + `cert_type` = #{certType,jdbcType=VARCHAR}, + `cert_name` = #{certName,jdbcType=VARCHAR}, + `project_name` = #{projectName,jdbcType=VARCHAR}, + `cert_unit` = #{certUnit,jdbcType=VARCHAR}, + `begin_date` = #{beginDate,jdbcType=TIMESTAMP}, + `end_Date` = #{endDate,jdbcType=TIMESTAMP}, + `note` = #{note,jdbcType=VARCHAR}, + `modify_person` = #{modifyPerson,jdbcType=VARCHAR}, + `modify_time` = #{modifyTime,jdbcType=VARCHAR} + where `id` = #{id,jdbcType=INTEGER} + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/target/classes/com/soft/line/mapper/CodeDetailMapper.class b/target/classes/com/soft/line/mapper/CodeDetailMapper.class new file mode 100644 index 0000000000000000000000000000000000000000..e0290367d1c09676fee8598d2dbebeb2f81deb3f GIT binary patch literal 1009 zcmb7?T~8B16o$_f+R|F3d?V_O!KA%mLIMd%jR`_D#uAA&-cPs3GGun9nVluszs3bW zfFEUiw`(a-B6u;`oipd-Ip;mszb~(dXpi1h=~b0p3#w?Fun&T^TiwXTGI76xG}^Lc z8+6FzksI(a2c=D?{Y6mogu|H|oGPzk4(t=8@Ekcm5VV}I;V68}PQ8wm&%Sad=yR)k zt}c``$_`~Ocx{KBSxfuT;(`_;p!~>2EU2FU7F2@XeouiK^G}`VzTq3RLu*}7K|2e` zcU|X)QjJt}#!~lTPNbST$Z=FhQ29cc6cx6LUXGj%7{u<~o(`Va(@f)nYDL~dV=%8) zyO=~8w2@t%1OU`}dT3QhJs|dH9Ns@Vrw_={oCuMNS4<4@&d@wi{UNpPyFHCz^)|y~ zjDi}ua?@+Q=TaZ>CvDK~T8>+&dZI=n_B%N;w7a{Q@%Zi5ViwM5d)nc*{y8?WB1ljP z3r|#;7c@unxR-G&V{3_Es?q`+a#O8DHGJwg&u}(MaBbi`Phh|Kts~|IE&g{*la`QV q8Hr1@f*h-~2AsbrdEMe^eO$YdV^3ZuhXg?Y literal 0 HcmV?d00001 diff --git a/target/classes/com/soft/line/mapper/CodeDetailMapper.xml b/target/classes/com/soft/line/mapper/CodeDetailMapper.xml new file mode 100644 index 0000000..09bdbc0 --- /dev/null +++ b/target/classes/com/soft/line/mapper/CodeDetailMapper.xml @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + + insert into `code_detail` (`code_type`, `code_detail`, `code_content1`, + `code_content2`, `code_content3`, `code_content4`, + `orderby`, `note`) + values (#{codeType,jdbcType=VARCHAR}, #{codeDetail,jdbcType=VARCHAR}, #{codeContent1,jdbcType=VARCHAR}, + #{codeContent2,jdbcType=VARCHAR}, #{codeContent3,jdbcType=VARCHAR}, #{codeContent4,jdbcType=VARCHAR}, + #{orderby,jdbcType=INTEGER}, #{note,jdbcType=VARCHAR}) + + + + + + + + + + + + \ No newline at end of file diff --git a/target/classes/com/soft/line/mapper/ContractInfoMapper.class b/target/classes/com/soft/line/mapper/ContractInfoMapper.class new file mode 100644 index 0000000000000000000000000000000000000000..f29eed3c3e806292e7c721d52094706ab485f256 GIT binary patch literal 1851 zcmb_c+iuf95S>lil$5rV-YHOM=q2G&bLj(8s!9n66p@yyt&kABZ0v2i#a>72btV5A z4}1V0g&6PJiQ^O$As$xp%$_-OW_CP3e|`S}0DG`E2`?w%6@elb0h5ZrcBN(eo)!4# z%5u42788oA$a>=oC8@2N;@q!Qn*`<#nY!?uV=Ae~6q5mgX*&Z#({P?J+m{Zekm-lR zT#O(vUuj*^D{6&`yVfD?YThxAb_tYDc}GwcN`$@6!S+p*OGU>zRg#NNE#vvvzGSwl z9cZ#**mbB*6<|(VHKJq5Ju0IQEb0?$rlwG=!(^>GLj42^94jgr(z@#s*vN@Qo_=jD z9;g}tH-{OukQ~$g2nr7{-C~C+)K+i%p-P_*Uuo6$L(y|IqNY<9&JjK$fl4B9pdp#w zCf$yozxUQAvV4M^++&}3z}qhCO+{S@Us1(MJ^(0ecau-k|}Gb-bm z&hueG%^_zZC7t}NvcHUU{HpW0v~L;yE^EWivkM*=Nz3}O?#0hOpmk~ZLbI95@N)pY znH`RF5^}vmePd26=*tM;|ImX*bQX1)DbrMwmYohf3aZ5OIzx5+CscgHg+X8nW%i9z zKa@6m$6cJdl{7S7b-0zfOzy_NGJ&1J&4`N%?*=xbf#Y)2|Gxf>%swg-z@>pZ7hqu= zHNiOA6KGA~Vgx|fWY%>f~WBmU$M1rM1 zUoFE*5>+Yy62U5-J9t(Km|zXh-2nZ)&sC(m2luh4MCv+XjnoG^ZaOYLiCahTL)buv zL6p&cl(RQ;_Eyf`&e=Oq=_jxDl0P0wUd3cja=}mGneNqY&TnOHl=~cc3-IDMr!V5J literal 0 HcmV?d00001 diff --git a/target/classes/com/soft/line/mapper/ContractInfoMapper.xml b/target/classes/com/soft/line/mapper/ContractInfoMapper.xml new file mode 100644 index 0000000..594fdd9 --- /dev/null +++ b/target/classes/com/soft/line/mapper/ContractInfoMapper.xml @@ -0,0 +1,252 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + insert into `contract_info` (`dep_id`, `contract_name`, `pro_id`, + `total_amount`, `part_a`, `part_b`, + `sign_time`, `sign_addr`, `begin_date`, + `end_date`, `payment`, `note`, + `modify_person`,`contract_type` + ) + values (#{depId,jdbcType=VARCHAR}, #{contractName,jdbcType=VARCHAR}, #{proId,jdbcType=VARCHAR}, + #{totalAmount,jdbcType=DECIMAL}, #{partA,jdbcType=VARCHAR}, #{partB,jdbcType=VARCHAR}, + #{signTime,jdbcType=TIMESTAMP}, #{signAddr,jdbcType=VARCHAR}, #{beginDate,jdbcType=TIMESTAMP}, + #{endDate,jdbcType=TIMESTAMP}, #{payment,jdbcType=VARCHAR}, #{note,jdbcType=VARCHAR}, + #{modifyPerson,jdbcType=VARCHAR},#{contractType,jdbcType=VARCHAR} + ) + + + + insert into `contract_info` (`dep_id`, `contract_name`, `pro_id`, + `total_amount`, `part_a`, `part_b`, + `sign_time`, `sign_addr`, `begin_date`, + `end_date`, `payment`, `note`, + `modify_person`,`contract_type` + ) + values (#{depId,jdbcType=VARCHAR}, #{contractName,jdbcType=VARCHAR}, #{proId,jdbcType=VARCHAR}, + #{totalAmount,jdbcType=DECIMAL}, #{partA,jdbcType=VARCHAR}, #{partB,jdbcType=VARCHAR}, + #{signTime,jdbcType=TIMESTAMP}, #{signAddr,jdbcType=VARCHAR}, #{beginDate,jdbcType=TIMESTAMP}, + #{endDate,jdbcType=TIMESTAMP}, #{payment,jdbcType=VARCHAR}, #{note,jdbcType=VARCHAR}, + #{modifyPerson,jdbcType=VARCHAR},#{contractType,jdbcType=VARCHAR} + ) + + + + update `contract_info` set `del_flg` = '1' where `id` = #{id,jdbcType=INTEGER} + + + + update `contract_info` set `dep_id` = #{depId,jdbcType=VARCHAR}, + `contract_name` = #{contractName,jdbcType=VARCHAR}, + `pro_id` = #{proId,jdbcType=VARCHAR}, + `total_amount` = #{totalAmount,jdbcType=DECIMAL}, + `part_a` = #{partA,jdbcType=VARCHAR}, + `part_b` = #{partB,jdbcType=VARCHAR}, + `sign_time` = #{signTime,jdbcType=TIMESTAMP}, + `sign_addr` = #{signAddr,jdbcType=VARCHAR}, + `begin_date` = #{beginDate,jdbcType=TIMESTAMP}, + `end_date` = #{endDate,jdbcType=TIMESTAMP}, + `payment` = #{payment,jdbcType=VARCHAR}, + `note` = #{note,jdbcType=VARCHAR}, + `contract_type` = #{contractType,jdbcType=VARCHAR}, + `modify_person` = #{modifyPerson,jdbcType=VARCHAR}, + `modify_time` = #{modifyTime,jdbcType=TIMESTAMP} + where `id` = #{id,jdbcType=INTEGER} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/target/classes/com/soft/line/mapper/MenuButtonInfoMapper.class b/target/classes/com/soft/line/mapper/MenuButtonInfoMapper.class new file mode 100644 index 0000000000000000000000000000000000000000..2fea8b5510abb9d255b60cf5884a6170bf11d9af GIT binary patch literal 972 zcma)5U2oGc6umBOx|T7v0UhOQ2#G0u!7sdwPDt$oQba2zD)H{7UgjyWE616Xzs3VU zfFFf8`PkL~5`C~7AD?^9^}RPge|`T!MDOW!mtJ-0n31P+Dy?JW`?Js_JT(`N$4W~s zwNozVbE&gw=A6-izA)oaz-WIi-KANb3o8=oq)j1XWoYb*(QqYWVAH&a3sw`os)KPi z@PpZvxE4GXI^qjwm5xe5FDc24c9xYB$Zx)8NFb5lRH~M-yfvF>ZJcn*XxP4;85?o2 z7U8AjY6&>y;*P+}s4=6?wTLsxXs?+aqqZLuFFH(-b?Bz~xmAg<`Dd9k`rvP58)zpZ zX~(0js>G$dvJ!&Z zs5zxcY4FFCR%8t7-L!pKUZKGrBeVv80Fl>bbdTCNcW~-pgoyxkX$OP?>b0nct&epd z>!=0lF4lt-`0ZyOF?;l|j)6=OQ}A~Ss~bK@`*Z-H_Bt%R9?@e!Pe5+b0F)zo+SIA8 Sh5( + + + + + + + + + + + insert into `menu_button_info` (`menu_id`, `button_id`, `modify_person`, + `modify_time`) + values (#{menuId,jdbcType=INTEGER}, #{buttonId,jdbcType=VARCHAR}, #{modifyPerson,jdbcType=VARCHAR}, + #{modifyTime,jdbcType=TIMESTAMP}) + + + + + + + + + + delete from menu_button_info where menu_id=#{menuId} and button_id=#{buttonId} + + + + delete from menu_button_info where menu_id in (select mi.id from menu_info mi where mi.id=#{menuId}) + + + + \ No newline at end of file diff --git a/target/classes/com/soft/line/mapper/MenuInfoMapper.class b/target/classes/com/soft/line/mapper/MenuInfoMapper.class new file mode 100644 index 0000000000000000000000000000000000000000..e785bf38ba19187d86654dc877f3e829553c9546 GIT binary patch literal 1512 zcmbVM+fExX5FLk02qhFk3%y^Up`jP{p{S}9REazwMGXa!UY<>2g3-o~yk4aIS|9oW z{iv$P>n+(PD?oj)>>1BFGjn|T_4~(9BHE$tBE2cnTSl`|MZ#D{>$O%#_k&2E+8~rl z1VUM9hrxkRaZ{b@`c{+C(t)sNx_iV8?+YtT1Og*E+H|pq2VHIj7F`iylhJCebqn%vHHI<<*&xN{BwX2xX)W9Vv`Hj6W zWb{7E-L^)mUOiJ_>e=$H*vc?y$;j3j&Go_f867h!y5&~`wo+U66t}T~_xpb_?_Sf^ zN2Fdqj&Tfq@l8hZBovpz?{-ITL|AfjbKLC?H5sAe*`1VT^Li z9Sv3|lW(e)E&uO1>0o4fn#L!E(dt^y>%>Wp2bl_P35LWY^_#|7X40Rc&tOw#Eq%uiILO6tVsd;Hv!z_ ztjj%Nvp2X>Yi9Ev@BupcFyYJ*E+ggP$vGZb-H9;Y*0Je`eHr2otT++ey9Vt*m~Hn^ z8EyP4Wk1=w`~rL^UfbwZd-_>Mj0*Tzh|1G=dNd7t2G$II10uMJldd@`jiTn0s9Ur! z?kZ%c(|)P|zoc5) R1cF@?K6ndJuV5AE^&cmFd(8j< literal 0 HcmV?d00001 diff --git a/target/classes/com/soft/line/mapper/MenuInfoMapper.xml b/target/classes/com/soft/line/mapper/MenuInfoMapper.xml new file mode 100644 index 0000000..fbb5ef1 --- /dev/null +++ b/target/classes/com/soft/line/mapper/MenuInfoMapper.xml @@ -0,0 +1,119 @@ + + + + + + + + + + + + + + + + + insert into `menu_info` (`menu_icon`, `menu_name`, `state`, + `menu_url`, `orderby`, `p_id`, + `modify_person`, `modify_time`) + values (#{menuIcon,jdbcType=VARCHAR}, #{menuName,jdbcType=VARCHAR}, #{state,jdbcType=INTEGER}, + #{menuUrl,jdbcType=VARCHAR}, #{orderBy,jdbcType=VARCHAR}, #{pId,jdbcType=INTEGER}, + #{modifyPerson,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}) + + + + update `menu_info` set `menu_icon` = #{menuIcon,jdbcType=VARCHAR} , + `menu_name` = #{menuName,jdbcType=VARCHAR}, + `state` = #{state,jdbcType=INTEGER}, + `menu_url` = #{menuUrl,jdbcType=VARCHAR}, + `orderby` = #{orderBy,jdbcType=VARCHAR}, + `p_id` = #{pId,jdbcType=INTEGER}, + `modify_person` = #{modifyPerson,jdbcType=VARCHAR}, + `modify_time` = #{modifyTime,jdbcType=TIMESTAMP} + where `id` = #{id,jdbcType=INTEGER} + + + + delete from menu_info where id = #{id} + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/target/classes/com/soft/line/mapper/RoleInfoMapper.class b/target/classes/com/soft/line/mapper/RoleInfoMapper.class new file mode 100644 index 0000000000000000000000000000000000000000..f24cd9f70692660304d306ab9a6aa4c2cf92b357 GIT binary patch literal 948 zcma)4U2oGc6umBMx{i*G7B;?-_>k5Y{JZk<_R)Qy5GkVq5sU3}5)lOCJz}vLY_>4jsefST?(G5n9AsH-CmalKGEx0ZP z9S;1X6BvGRUZ9dhepR`eYq@Uui7}}YPNfFTe?3iY%ta=mOUcz7;hc*Gz)Ke1?OqFA z;Mwgcg{tpORoB7aY_x{6YK|ZMY9bB$ZJWJ<-p~a`TeGyVk^HDM42`^+pA$ALllF~Y zIYuvkA1O8rx%EgZC>)jhSuR7hL;)jA8~aSu+rVbh25w#4y6CG9;&f;ess6uHTXY*L zHETcw^fujTgm%_KyGY%oVUrpmbq{CYecZ>{%V`AAK0T;G{SHBryoLwvcN*ZJ`P~8M SAw5E%w&C%N9^>1gC%*u-R`KTm literal 0 HcmV?d00001 diff --git a/target/classes/com/soft/line/mapper/RoleInfoMapper.xml b/target/classes/com/soft/line/mapper/RoleInfoMapper.xml new file mode 100644 index 0000000..84cc1ea --- /dev/null +++ b/target/classes/com/soft/line/mapper/RoleInfoMapper.xml @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + insert into `role_info` (`name`,`state`,`modify_person`,`modify_time`) + values (#{roleName},#{state},#{modifyPerson},#{modifyTime}) + + + + update `role_info` set `name` = #{roleName},`state` = #{state},`modify_person`=#{modifyPerson},`modify_time`=#{modifyTime} + where `id` = #{id} + + + + + + + + delete from role_info where id = #{roleId} + + + + + + \ No newline at end of file diff --git a/target/classes/com/soft/line/mapper/RoleMenuMapper.class b/target/classes/com/soft/line/mapper/RoleMenuMapper.class new file mode 100644 index 0000000000000000000000000000000000000000..989d0654f36a71c52dc96569a76d0ab2ca67e4e5 GIT binary patch literal 866 zcmah{%We}f6ul04O(~@hNGXpE6;iSQFX*laDOn&zBqC}g_D<$@>dIqB9#5tDH5PmT zAB8xRv@-!JSX|BZ@$tFGXZ+*mx9>!BMz1>bqC+nQwYAOI2SL;R@&>r&hR)!ld{drrn|^PaJFoBQy1&YVg{zO zf?i+bHt3YU>P#;TS29CuT~I+g3&A%N=M$+`YI(&{F92s!)daadbuOrNqfE|%4l_2q z45MP^b*g;vnF~Q@_g#E2S-Mna?lMTDElY-(P{<2hU<&WhY-pH{HiAQAAl@Hr;>v?I za-y>URy5a%RU!A7{{An*hyP6Z2!*{Eo&%4Ha&{S1?_R%1ykeFPOXkVl(G4)P@u-Ts z*B@{F+^zq%Gk3XP@+WOz`RMM#Q?**Le^ t0iZ)b4LZX52|cYT7z(Jj4Z#DTV|sRLEoxM@N=wI$dg32GPS!J?{{lYL*xmpD literal 0 HcmV?d00001 diff --git a/target/classes/com/soft/line/mapper/RoleMenuMapper.xml b/target/classes/com/soft/line/mapper/RoleMenuMapper.xml new file mode 100644 index 0000000..8d7cce3 --- /dev/null +++ b/target/classes/com/soft/line/mapper/RoleMenuMapper.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + insert into `role_menu` (`role_id`, `menu_button_id`, `modify_person`) + select #{roleId}, mbi.id ,#{modifyPerson} from menu_button_info mbi + where mbi.menu_id = #{menuId} and mbi.button_id = #{buttonId} + + + + + + delete from role_menu where role_id = #{roleId} + + + + delete from role_menu where menu_button_id in (select mbi.id from menu_button_info mbi where mbi.menu_id =(select mi.id from menu_info mi where mi.id=#{menuId})) + + + + delete from role_menu where menu_button_id in (select mbi.id from menu_button_info mbi where mbi.menu_id=#{menuId} and mbi.button_id=#{buttonId}) + + \ No newline at end of file diff --git a/target/classes/com/soft/line/mapper/UserInfoMapper.class b/target/classes/com/soft/line/mapper/UserInfoMapper.class new file mode 100644 index 0000000000000000000000000000000000000000..9d464b13206cde679dc97db881a9692396d3a23c GIT binary patch literal 1394 zcma)6+iuf95S`7nX`41Q5bl?@TpU0cseN-*sd+%MNNLmv`n)7tXDesdTCYL=H6Hi? zJ_<2wJI%!r$wQ*enb|pK&d%h|-(SB0;27Rl;cXS(5vXtxGNlO|Slxjf+o8PHw$BB# znb2Iv_E!wM;#xXwmq6p3>5&}vsG?)0nF_IhVgsp$1olGavw`l!J;ldV#h+PB;MnTk z&>z(Hsqk!9Xy!5Hv{x_@C~z!TOADU)J{GsyX`x7S-|q5IJDAYto}fBXjKEPY;baBN zsi_cQcU|dmLEvL1HDNfX!5T7)V;T_nws7%erscj?TzF0%IbEatmd7-9Z(ab6-d~`> z0*SS=j*J#^{x9X?`wc#rW2DSiTF1KTkR{3plq}cG#!eIrsb-UTA+TZ0HKRkIiJeRW zo%kYP!o>$Z%G4&qkvX+`HYzf^Zp{_#jig{_VrXc-;B?}#N5k-EGMiURnDTFuM^>vT z2ZlFm*6`vnxaDo6o}>+TV$*bMiIiFYrlMPxyF?K>y^Yr6_DyW84`d{8?=Gd!3`0d_ zht0l>)PQ~BKB{U?{KwG_nEGH|oWSAy&f`2|>~`nVR9yS%4yQ9yA%IJY|0DqQ5`iL= z@OK%1m609*p(<=lp;`iM!WKf?m{mw_?Z7UcvRe&=)6gBfy$8)@p}QEm2d%}z_h;!J zBwP>S(KPFE0zHAJ8B{OAGo*WtpBG7J9}comtpJz}so+C+IfW6*vR~yDyq<;LU?u?z IzYEa*2cREu`v3p{ literal 0 HcmV?d00001 diff --git a/target/classes/com/soft/line/mapper/UserInfoMapper.xml b/target/classes/com/soft/line/mapper/UserInfoMapper.xml new file mode 100644 index 0000000..513d3ca --- /dev/null +++ b/target/classes/com/soft/line/mapper/UserInfoMapper.xml @@ -0,0 +1,149 @@ + + + + + + + + + + + + + + + + + + + + + insert into `user_info` (`user_name`, `password`, `phone`, + `modify_person`, `modify_time`, `head_img_url`, + `user_status`, `role_id`, `salt`, + `open_id`,`dep_id`) + values (#{userName,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR}, #{phone,jdbcType=VARCHAR}, + 'admin', now(), #{headImgUrl,jdbcType=VARCHAR}, + #{userStatus,jdbcType=VARCHAR}, #{roleId,jdbcType=INTEGER}, #{salt,jdbcType=VARCHAR}, + #{openId,jdbcType=VARCHAR},#{depId,jdbcType=VARCHAR}) + + + + + + + + DELETE FROM `user_info` + WHERE `id`=#{id,jdbcType=INTEGER} + + + + UPDATE `user_info` + + `user_name`=#{userName,jdbcType=VARCHAR}, + `password`=#{password,jdbcType=VARCHAR}, + `phone`=#{phone,jdbcType=VARCHAR}, + `modify_person`=#{modifyPerson,jdbcType=VARCHAR}, + `head_img_url`=#{headImgUrl,jdbcType=VARCHAR}, + `user_status`=#{userStatus,jdbcType=VARCHAR}, + `dep_id`=#{depId,jdbcType=INTEGER}, + `role_id`=#{roleId,jdbcType=INTEGER} + + WHERE `id`=#{id,jdbcType=INTEGER} + + + + + + UPDATE `user_info` + SET `open_id`=#{openId} + WHERE `id`=#{id} + + + + UPDATE `user_info` + SET `password`=#{password} + WHERE `id`=#{id} + + + + UPDATE `user_info` + SET `open_id`=null + WHERE `id`=#{id} + + + + + \ No newline at end of file diff --git a/target/classes/com/soft/line/mapper/WorkJournalMapper.class b/target/classes/com/soft/line/mapper/WorkJournalMapper.class new file mode 100644 index 0000000000000000000000000000000000000000..852ee958ce172fd3d4e63e5b8eef38be428e6453 GIT binary patch literal 450 zcmaiwy-ou$5QNA1I}-jv3f=&8*Wf0i2||Jb3Al(zDX7h52@XCx@;Q<2)hKuX9tyGC z6$zq9w>utv>zS|bk52$Y3?lR+oCtKZEyxFfvpCIME(`Y>q|ufn*`PxypPheya4T<> z8721u{V|0%H=8K0ath=NW_Ze+p9u^KGL(hea^iKaeECSFz%Wi1YOSPEb}mzA=c8oz zC4q)!V7CU|7{l;5sX?otjZAeBMr@esxm981N#OFI;cEAxYlifuoG+t0ZJ2Vp6?m+c zOY#@L-xoOlTTfoSZP!z~xuH$mr02{h5-z0F&jy8~E?u(y%AmDIyN PO9$*~;E<=IYC8S_5}tf| literal 0 HcmV?d00001 diff --git a/target/classes/com/soft/line/mapper/WorkJournalMapper.xml b/target/classes/com/soft/line/mapper/WorkJournalMapper.xml new file mode 100644 index 0000000..1f244c8 --- /dev/null +++ b/target/classes/com/soft/line/mapper/WorkJournalMapper.xml @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + insert into `work_journal` (`work_type`, `work_table`, `work_table_seq`, + `work_date`, `note`, `modify_person`, + `modify_time`, `db_op_type`) + values (#{workType,jdbcType=VARCHAR}, #{workTable,jdbcType=VARCHAR}, #{workTableSeq,jdbcType=BIGINT}, + #{workDate,jdbcType=TIMESTAMP}, #{note,jdbcType=VARCHAR}, #{modifyPerson,jdbcType=VARCHAR}, + #{modifyTime,jdbcType=TIMESTAMP}, #{dbOpType,jdbcType=VARCHAR}) + + + + \ No newline at end of file diff --git a/target/classes/com/soft/line/service/AppletCertificateService.class b/target/classes/com/soft/line/service/AppletCertificateService.class new file mode 100644 index 0000000000000000000000000000000000000000..a01a60374dd799a8adf3081d264cc04e74757ad0 GIT binary patch literal 878 zcma)4O;5r=5S>Ln1Qh`lxOnq`7ka>3jR`UFR21!rc9&nT6c3x_LwO;!x<2KSZ|u8cUGE5jE7 z8i^9VF_{|UCI9-sIPsOqpsSb8kV{L%ios}LE%}<~RXj3}YS)^eT7>SDOTI#dGG=fZ zZGR>_VoOpcXiCl7P z$2bPoV9zuRlu#RE97Vq7@o_@he7}xpU8GhzZC}@B(-xdXE}OfqCb6gIz9%R*S!%-$ z6Y1cK@X6oX1IaeZwQz8_T`Pm3ejITI9uAsUF=(adknShjMwJ1B5?vxdz0BYQ$^i6M ypi0piMJu%YEl6Jp8U&pcL+8cN1vH5$Z+Mw6kNt`Bi7aw&vLyB@#f|fKa)S$*ve4wplbmj+ zOJi|(HCd^(l2&DjoKvM6{zU%esXIklx@e}VyM(?F5X5{!K+Qw~n$>*Glz>j^A`?H% zc*kV|jy}VnCled32)B7!b60wel~Do5qdd1rW0$5bo1M!0tzUg#@P`u3Q*NlEuT8brw;R}IyAJ0l~yy6Kl%?H=Qn8OP`Yb7vEBIvziZL< literal 0 HcmV?d00001 diff --git a/target/classes/com/soft/line/service/AttachMentInfoService.class b/target/classes/com/soft/line/service/AttachMentInfoService.class new file mode 100644 index 0000000000000000000000000000000000000000..b089825bae17bc528a055f27e87bffa1191bf006 GIT binary patch literal 676 zcmbV~%}T>S5XWcxX{*)xdGHBZ1ot8+qzJtTg#?9&M`4?8(yjSoGim9odGG;zC~>x_ zHMTbolg-XB^Pl<6etx}w0Kg4gG~uiX=L}kz45f#|Fl2Dsvu9#1cqrn4yQozhSS8OW zMj1$L^$TB)D&)4x&|=VaBu^+prYb5#%v%r$vl z|ED*wy(HpU;v)}LEIBDCT=L;YZxs89bx&&q?*A7}R9EGUFLln*`ZAsT8zxcD z#BX8oYNA;aQ>+w5^R7)&5A#sRf*!3C+RJZ>oZ`k7bkl67aP^zH>V`j{_jYM(&(Siz n%vW-!p@KqBP6+h+3J2(m9yAI=(FsPP$D#)UBagySJ3RgZmoaNX literal 0 HcmV?d00001 diff --git a/target/classes/com/soft/line/service/CertificateInfoService.class b/target/classes/com/soft/line/service/CertificateInfoService.class new file mode 100644 index 0000000000000000000000000000000000000000..0a37eb0a3bc3481972b30f7e5696aa738a80402d GIT binary patch literal 1290 zcmb7EO>fgc5S>lZq-jeVQoc(0D)f*@2n&e=k}D({gk&j&h)CSG_Qu)DSzDWRrJVR* z9QXnJD8yUG)W!v24pF>2GjHBJzw!4UU%wI2D?0Ab(+)jjv>OUD5qcRb9=(ksM#qEk z1;6A@#8v1_jg~5OhwH1<$jBMXrEwYc&V-rA!GvqR5C#B@Hq)ihA8=&Uoyt&glWIJV zYXF{%{dnOlpk2S#d%WN{2 z*s@jxzc6yE!P?4Lkan5`@BpJNKTef7U5z|69ORgpQ$1xwD70I8OTWzPF=|NUH+@@W z4G;gEuDo}aB%`A;wY6!o1t_~cuH@8Jy0SO5hsLDSIMu#*FC&b7ShBg*ek$~(^u-Iy zlhO0vcL(pp2CK`H*I;vt^Z`vDO$AJU@& PWcv!_F>;^a)S#oE!D(Y- literal 0 HcmV?d00001 diff --git a/target/classes/com/soft/line/service/CodeDetailService.class b/target/classes/com/soft/line/service/CodeDetailService.class new file mode 100644 index 0000000000000000000000000000000000000000..746cbed93cf5d33337cdfb93a20f0c17d768fa3a GIT binary patch literal 641 zcma)4%T5A85UfTXf~bhZgJ%=v;>5%Q3C4pMJ&2KH{ef|5amcc3W(Sh}H4lD(A7$)i zB|H;7ZFf&?O?B0LeSdrcxJ09bdI^Vwddva)?k4G3GtxGB;Dm60)*b4JR)G!&%5&C) zgZBEQ+4ZB5ilbMj0u!?0&>5GgPSodHcG?7OLhX^=Th#Aqt4HkE#)NHO0ME%g6Dnz$ zVF|~Xl1>ylVY*mW)cU8QHQ9v5Y{OL8jGa(T@1D1{MO3ElWW$}!%!aWuf$Eyr$%@_E7*^3oTiE9X#@Pf6wy7RsB(l~wf46kWxxP^KgWnv(2EnZv$N I)TY(J4<~rCBLDyZ literal 0 HcmV?d00001 diff --git a/target/classes/com/soft/line/service/ContractInfoService.class b/target/classes/com/soft/line/service/ContractInfoService.class new file mode 100644 index 0000000000000000000000000000000000000000..362750c69e40bffb2bd934b66ab578dd1800a113 GIT binary patch literal 1109 zcma)5O>5gg5S?`#J5JJkw@v!pOR+Cm0zDKI0&Yve;Isil?`vryZ&h8mZ%;68SN{!q5h1{~dqo;mwju%azo~QCn$m_?(eP zct#kvbGq|5L2N~+2rYxXC1gSGCxcH*!Mbqi=!%FU1|PaLkhw{lVWGam%3xjU85%p3 zGs|GVio%6Fwx;sQM-W}Io)&IqD@!BcxF3c|rWgDFd^3ppI{Hp)WY8^U`wb1W#TZR> zMa9y30|pIAgcm&W<6F7l)beZ2<$aY)?yS;jo*M(TR8v>=if8K!L0XTJ%!K$&DksI< z8*UFHG}ki3V~3DI&s~AiW3(Tad}OlX09^)8%8QnpxW#}JqRR)c)+Bd8lm1reZm}9P-q8s%j&(wjD1QS{8{}Jo)rx`4R}t~hrY=X QyeONLKwnbrD-ZegZ>6OzzW@LL literal 0 HcmV?d00001 diff --git a/target/classes/com/soft/line/service/LoginService.class b/target/classes/com/soft/line/service/LoginService.class new file mode 100644 index 0000000000000000000000000000000000000000..c0a11ee11f9da652eeb449b9da14c0ca1480704b GIT binary patch literal 1019 zcmbtT$w~u35Uq}hSzP13okUO%+6To;f*^t*Bp3`HJa%R(V~3gU(9`YmYaaXnKT51j zg3CBL1P{Z|UG?hKt9t$Z@%jb;r?69mts-nQD7zRe*tb$EeyO8Kt6Pj+Xlo1>n`j@j-x5YdXwk$BrXtZNj;zIf>Tz~jP|nklTNRWI&GneWE_+G80`OnBGt4nd?4vNk(^m+YiB&Xk|8lx zlkK+AJW3Cb2Zm>```hP)9|ZZ&O!9Z~I1)1qwN5i&kfZkmP|B0pAy20QoeB)5=~tvL wmxRht0icu_m?g+4WiGjzhlMQEB4t;{hnBKK%Y<5i)uiwmtP?+jjiigsPppw5GXMYp literal 0 HcmV?d00001 diff --git a/target/classes/com/soft/line/service/MenuInfoService.class b/target/classes/com/soft/line/service/MenuInfoService.class new file mode 100644 index 0000000000000000000000000000000000000000..ee2cb9be9350548963498f82f85080c9177f132e GIT binary patch literal 1230 zcma)5O;g)25M8B^5Fj+9K)=6ep~0=$TCy^wI2Ed z`lC8sNrt#!N^jEJ-M4S`R={UMGCyz5WS=sERr&0}v$ z)8Swe$i$1dp64fCN+ULBamti8!{b<-${~U7lnJ z?^lQqU7whW$n&-0A{thZUibRtk0bojeVxW=P=f z%@CJc!SbDQFho8YTVO;-Z%YlQyW0;77vvG`IL7W@LMzRXp?KJplwZ(R)JGj+}b z_SP&JZs6a%nG0TSZ<&nd+MTp}>V8I(0Q!#K7+`$~orWd6E#qw&*A=?Z!eawgFw}Mj66-72(cp&r~Tv)T>7EZDN}_EmVt!uR0;X1g8_k?;{bUi5fk dQ=VRjp271)mQ(VgLi7@ecB^+xeq|?o{RdnTMU?;m literal 0 HcmV?d00001 diff --git a/target/classes/com/soft/line/service/RoleInfoService.class b/target/classes/com/soft/line/service/RoleInfoService.class new file mode 100644 index 0000000000000000000000000000000000000000..95b1abcca33ef63e731a53ed62e1ec377c8e3bf6 GIT binary patch literal 826 zcma)4+e*Vg5S^{HH*dAxKR{?-Ttpv)l!7lpp;fWq`!*TVmF*^MHUk-4jqJ#?%QKt@KaNaId8;aQL zWMrYVlXT2u5#j_@jE3KnnXxfw4$)4c;9eLpMT;h3ur?JjgV!ap?wnf*9rBSiQion4 zayNdaM^krymCR`tf)ssf`JYvKnGThJq_!kuYpGYS^T^<8DfmxncXdq!0fR~!2g1>B z`BAE^)B2V~V$jZ+GcEesVu+?FMlMgMPaMV#j>u}xm|t&Bb5S>Ln1iui(5IZZe@fy1`6lgFepvI%IT$cqF?`|)9b0jqWFbjWxKgu}V zfdSzXW3k1&w=?r*-h6(&e*nNG)Cy27z!8I5h#XajN`!4~uChi!oUy3`FU^6IpC609eksIzwlqO`bk~%K;hn9mz`9pgN zd3YI1fp&AP-8^j}=Z{sIq_Vy`p){xlN^m4?CqhR)-bdc8(NWNv-pHUgQsJ}YhCwwZ z37V4$T3MvDroCw(6R^&`S)nKHztTJ_d#p4zEbeX%{Qr2hz6>@sE;%|fLbjDlgC09S zE<4gpl#mxQcNv@s?OCB7pyeuGT46$xF^i*^e@}K)*OBh?Tt8TzN`)Mi zmG*^yX+j2zH)y*$ZV4m$Xwl>hs)a+u1KfFy2Fd#C&rX zTBj%!`M4UB{X2rcV6{jW%3i$O5#7yfeF*n=HkHK$P3VkQ%}_Dh)`f}iQl>PHRoA*3 zRvXQujPS_a!QkNc+K|Q_e(%jtOxrWEG#FKt0p&_t2~aK5{Gm+W75b`>0{|)oFinDC tX@*W_=_$b+9nC{+q^^7Q0xXV7OTM%WD}Mo239tt1BlQMx8Eks`)+Y)i+J^uD literal 0 HcmV?d00001 diff --git a/target/classes/com/soft/line/service/impl/AppletCertificateServiceImpl.class b/target/classes/com/soft/line/service/impl/AppletCertificateServiceImpl.class new file mode 100644 index 0000000000000000000000000000000000000000..e8e589a7cfd16b92063a7fd22a0423f3e471de12 GIT binary patch literal 9590 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 literal 0 HcmV?d00001 diff --git a/target/classes/com/soft/line/service/impl/AppletCommonServiceImpl.class b/target/classes/com/soft/line/service/impl/AppletCommonServiceImpl.class new file mode 100644 index 0000000000000000000000000000000000000000..3bcfb438971e4a408ba23b91b77f08b96658d4de GIT binary patch literal 5850 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 literal 0 HcmV?d00001 diff --git a/target/classes/com/soft/line/service/impl/AppletContractServiceImpl.class b/target/classes/com/soft/line/service/impl/AppletContractServiceImpl.class new file mode 100644 index 0000000000000000000000000000000000000000..e468f42af7eec60a2f73580e5e65ed07488d69ea GIT binary patch literal 10591 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 bPeH8a(Vv3GVEj)ZbD^BeHz|?+2hkq^9WTH) literal 0 HcmV?d00001 diff --git a/target/classes/com/soft/line/service/impl/AttachmentInfoServiceImpl.class b/target/classes/com/soft/line/service/impl/AttachmentInfoServiceImpl.class new file mode 100644 index 0000000000000000000000000000000000000000..463fb2b3194169a9947023113c6054fc7795f8d3 GIT binary patch literal 6150 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 literal 0 HcmV?d00001 diff --git a/target/classes/com/soft/line/service/impl/CertificateInfoServiceImpl.class b/target/classes/com/soft/line/service/impl/CertificateInfoServiceImpl.class new file mode 100644 index 0000000000000000000000000000000000000000..adcd84376f159449f15b50e3bffe9c18d0cdb6eb GIT binary patch literal 5224 zcmcIn`FGUj6}_6VEi)sQnANmlu^r+y3dA%7yAWfS;>I?{19nIgh&-bi3y&o;qk*_v zx+dNCv`v?EOPlUZn$+OXrs;C}Lr?#m{?gO!K1rj|h$)z!Q+$v#pWgT0ecOGX{_?Na z-vBU(Kc#RliW|^{r8I0fDJ+caPTtjvmTl@w-nu^8NSbQeXDYU9Et#`c*_tn! zBew0hhHE)?S-}zC?sCbp3;B|AUq8s4`eWc<#SFMtnquOnT z>l)dGCDV4J;QAVa8)+a+B`w32ZMnx7hVGtO1x=$)&Q!2@f^JP!mgddUS%Z+h_+*XZ ztWmP$cd*#xE?D&8!I;IeS-N6nP2E~rF2;kB@!yT}6|HY7nC`S$Dm%7O94QtRbahW$ zGOieU(Xb18#+9fH_4rE_*DC50R@vpg)(UM*F{iMum&jA+{F1<{W>OUs765~%{3Js6ns(6fH%jnq!Tau+J| z`m#|l7tA7yN}uMVq>=iPtS8BV=UBLrUd76h>bFFMg4i^B#iL-~?G5diaH2_FS*|Ab za6~OZ58oW)$ja&YOJ>&fB5@?LPvG1^5Kr9(?j5LlIu`SF!oOW+?f^ksP!TmkV6Iwn zW|76nl8xaTlFmC4TU;+_ZcSw!63mH}(ea#u?m&;%LF2Y-3YA5&Rc)$q1qqAtTO;qP z;w-_e=t>$nUVFON*9zjr=2(d;IIzCWY*6Xxv(BPvE9i`E%3DQtv3{;9G3H92Y|N1V z7FnMj9jW++if=N^mE|1yT7hQSly_&$tWy$4qXG7MMF6*yg4az&)~kwdDHw_it~>Ff zP$-RLaAIYAOpGYlA64fwK&`Po915J6%zBgmzqecKaF(OXWBydesg$zjNlSQsZ-l;t zjxsgAzE5DYz#2}hGV^0PE-6G0whU=Fh(j9s(68bJ4M*^hif?Q94!*15IPwbi+?okx z|C1WNCztOduVE4|YS3}N0_Bj3A87a?UQ%#ZjsJuCRq-Pc{;`Ii;EaN1Be!JPDt@Zr zXZSg5M8hxeOBF9`cm==G@G4%@@N29xceTWfv4k{S!*vZ8u&QAVud_Hb+`w-%{1$I; zRMnpW8qWs}7e#T>%8>vf>Lu?Qeup;|9In^Hl3ma6RPlQaf50C#^q`k>pcVw5j(JFF zthaG~>ooWj!OE@I(4Yy)WwnrvvjhwtSQPZuZ{#?W2^X`>R`3o}2kM2rc^8|D=Q#S= z&t)DKI3>NQu3#Y6Gq;?qWDAws{f^vFCJ|?)OB-=9iE(4iDWYWh*wbXPz@W#h!O#oN zCebAlX1zy&`;87@F}e=8xd9{h5Y=vv<|9!g$K*!roJaeyY7BC9%5|4#%*z$C>;^HU zCn1X}xTo76dbOi$gCsL{>0p~Mf&?PID=2=^EFvC@b6ZD!AR0;4bo=rWNcU(e9n`;AnZsGktZ;i|wTTAmdIiA-CD53MN z@ZQ{e4azItmO)-c0jT;gubMA_x8Xtl;-Lo*(X4DfPNNCl)4i`D(YJoTM2m=9ziFoqE>=kA*?RU;ZfR7vZJLV65M$=&f_tzyqntC ztN+AS6_2ZUq8gkz5AB5z?TeHZwEBNT+jj%I&R;|ODs~6J-%1FhUXO*Lm|euhRf z1b&XdX9;|cMDl0^ydHwrL-73}`0jOqzlbMkO)~m7-dlLjGy=bdw~`y0+MCvJw}R(! zzdY?xSay4lHn%rRCfb|poojDi!#;ZV(!c*InQ8J!p%*DWKTcCm(7_9I@FE>F$b$2v zv@DxHhtn|Wdfsz%ko|X%eP_^dp_5GLa)vv`ynIcEE>8q5*Q!~h#wjHk+=gVB!GAzi zk^MWh1$9180iQT>6gO$!k4lAisq>v)zS{N&&DODoPO?XTjqXyc7~m4NV=+?pJ43uX zgHGE{IYFNAh|OnXc_%&RzY}7+srw47jD>Ji?5D8&+tAi^9rwJ70}^2+!u9RcVR0=% KMAa#@2>b`@#TgF( literal 0 HcmV?d00001 diff --git a/target/classes/com/soft/line/service/impl/CodeDetailServiceImpl.class b/target/classes/com/soft/line/service/impl/CodeDetailServiceImpl.class new file mode 100644 index 0000000000000000000000000000000000000000..6aa571bf6a99c5aca56c72ee493bab094ebf4777 GIT binary patch literal 1733 zcmbVMZBG+H5PtRwl(vT;A_%_mDlH%jh>Fr+5Q9;R5+QuwmTg(Q-ZghyNdJ{a6U7hy z0DqKm_O3u_OEBh=+ug~`Jo7v=yTAYZ`~_ec*(8#fO(2fB6dq#U{J8lonBQU?OG!M! zvT=AE$CEgoGQ=FO#L%Df{1OkG;_@NSd8Lx{R~h;W-oAV#wNTEMs8poSFr6!SWgd7% z%^l@RUJmViqsftihd)+bt;%vw1uE~zb=UQ@(8_ZIhLs4d;w!gQ^hH@7d;TY$m%
F)|c3kem3vnPCI z&UIslK2QX|)I=hX{*fw3uF4gsfyz!~enVCQ?hm9R3;Jbk+gD}b*WSq*!|QbJP#g*F z2)D#{wBfVbYRNR=NfJia8jvV`x6yjHRtZaQ$;psB?*%nxOX>q}e_I&swDgJ7NL1d2 z=W0s7c(Kfte=M^N?!YN+BlKx@2HTW#e(Y=Xidamx!OTS3RJC$=P6e8HCw5fH6}svZ z@pfu9hh(qRa?PljEzo#|bCTTgs(wLkDl-)$hD9{d4c(nLycyDMr!pXYrKhPgydJV@ zqaQbHTtjahD>jBPV>WZH$@S1ST04E?$$XCoGOwDXF6@FzWQEIDgmNZ#2*3w)$(p;)_WKfz=$a+oZWT8%zwS{hqEjwx*DV61R zfx&={`~5OtT*hrME(1C?(t3r#CqD4-@9>3(+j}J0mL0G4C!Rc!te?*BocFxv_S4_~ z^TwM1Ch_M49>8h>7A|kY5UwOqz?up>fp$1@S(lZoa&bkV*a@!_my#&qnu_a5JcW%; zd^mxR;OPWDijO7m3_hN~9(+Rfd{V`;3G|7DJ$O!5K9$4(KAps8@L9QhPQ~YC`3rLS zVkf?&;>+^$D=NO4z}N6~G5QS^-&FCuf_TBnE9g!+ZeA}Ia+89nbJA z$1W;399Ud;EjyocjWzSS<6hBMOv5hfIofpG4c(}2&}T}XbKP>yEY zwdliSgTKI7}FJ`$e`17VWQz*==I3=&b8?_x8NnJLs8G6aH3OebY z3aHLo-fC$@UpMmRs##zR^acKukWf{e^b6|xjS9Llrt4WbD`R-RDAjjGgi=<~fK~D#d1;ftkX-|SX6NLV)IJxMGD zJyCM})E7rOTr=aibiJ)WDHY#oV6pY26m7dR4trfCUXN_dW@qed;PFUk-gkM{_Dt!n zTUj_Ts~~0(Pfz4sMLfcLpmax&AT)G5aB?8(WY9foO~H3sL7_pW)hr1B`F*K%Rv7i^ z3`d0DWD{wpO+HOV?WCK>@5_r0HZRG6_t_W8=}oEmImE#324!8D-FNKD;j=--)i_BZYbDM3&e3|r-oPYdkyDs zL&Ix$otdZM57^Xj6Sou$)Q{IDZBRp5wtf&FV)0s8Hm-;PiI0Xia9hDc^_o}@cO6bD z{;1(kcvHg&4sc}D+z&c8$A5FBO(I&iJs1UBylYb1><~4&W*KyYM*;Sydb@ruHjKn` zoSUqZqUp(i^c%Z^iH4NF<4|Q^c}Kk+j#rtuQTJF|{y|8kp`i4(71^3IGSZuMXO{K$ znn&EtsIhqcmfOfL(QR4U!g+|P*|~7|nKBsw9+e)?ZL?Z{tz_WN_T( z7-r0Z)4#+yLh7-CQ7lqdfefQRueJ}K<CA$t4xAqEWcI)p9^)53o2r7L1*G|&~=p;o*H zM`*8$e^Z#IgZ)tPUL2*a_fdWy?}60&t5P#nsYm$s7~i)mR0AC6e+(xmc=FEhJMRvE zjPS<^YJz|c62AWbgntUB>6x&9m3+l`9}0=z7K6kf(VZOY*2>r(!(XtYjGb{TOJIWl z?C?pOM3OWQGN3|yU!bN+{7^`|kQ@YGR)pj&gwAsD3?8KdLG(QDk`Ke(U30f^&-}z+ zk(}5>_a=Jg#+V7aLZrP!T7$HgQ3WF%XOvaOImsCJFv7cOatJdKa)+xBhmpb@ZO2&( z^LUJQReqN*-~(JaOKnLg|3;6Bw2H+F>J--%9snw6U!ts_)!z#3*lqNkzlnP{u{#9b zUk7{;o!owcYEIJpDH=UZ;AaT@Q36jfH|8SX^(uJ13Vyr_exxPvOIW5gq52=ZckrHW z2EL5@6dY;mZ!6<%3SPj2^6P$u`LO3mdw;t`qQAY~x&HPt_R_nT|ND1|Oq*Y=qe$>~ zz$v+;gNt-{xGzHC%*LWFkkK+|S$9#8! zruKvnHE14M6`+Poc!IhliSrBJWapy}p_5ePOW;lrb1X zt=R?kvcA2b#(JyvdbiY=tTe5$4AU%IZP)`oNJ8r#x`pA_uwTNZMEu)LXeQTU$W>=S G9{3*!1jj%C literal 0 HcmV?d00001 diff --git a/target/classes/com/soft/line/service/impl/LoginServiceImpl.class b/target/classes/com/soft/line/service/impl/LoginServiceImpl.class new file mode 100644 index 0000000000000000000000000000000000000000..689df8c7e1c62a5310ce88473628633b247fa00f GIT binary patch literal 12041 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 Z`IwRI?ep<)=;SB#G;Dp1HTpBr{{aHHN^}4K literal 0 HcmV?d00001 diff --git a/target/classes/com/soft/line/service/impl/MenuInfoServiceImpl.class b/target/classes/com/soft/line/service/impl/MenuInfoServiceImpl.class new file mode 100644 index 0000000000000000000000000000000000000000..ba6decffac18ffcce3cf3e7cc2cfd8b964db61ca GIT binary patch literal 6983 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 i$?`7}-*65aAIG%{{=Lr)J77hF(5 zK@k-ZtMtJac?6|`k<#+n-yvH32CFE)+jsU!l%lLkZcm?k&-R`3o!h@Z`uSG?9r!wg zMhpkhS&8Q{62S2wb_Q@FgmNK$Ap}2O4C18A{97=cmRnI>V-i|JZ-T|hHx5=IF=NPE0&a4&IE8agmah@Mqdly^#I;b zP!_ji3c?ZFiD}9Bc*lemv12jA>7+1fTdt!=-9BsF?$;+L4M#z9Bx)zLq&@Cxanmxi zgeTW}OODb&{gIUAnh9grOq!!{qua7`TIhFAn#^Kzk;|mvoH3(@W+o=%+K@;#>6+2x zkQDb(D&kLOH}=_11~~<*n<5kX8C^@cW?UoQoy~dg5n7^d8SxfD79LcfoD+e1(ztHL z=vx3w1!YP>$T59bsucL5!ZFZx46UD1bMaL%-pkw8swXqH$cqVI?Yt%$TLSDTft1Uj*c1 z`YVR}$)m0-tZ=RY6*NR`l7bDk-?3AZJyUy($)jwg`B)97HgpeN5ty3&_K{th)it{0yeI>#tPqLa}&E`1R73E~`m=zkbQ%=;_X9^xQ z%*uy0(X$GgW*rAf*4D6HrmLkX)TyE!n*unm;w`+*PAG19f|%n*x8vwjvhBderSpvoFHCyig;Dasc72T zVGd`PBihgtBxSis*BVpMnh#HUg69J&Md^m3V$ijvNWqc}u?wfa=JtX8Xvm3=cxtL9{qOvV4NQl(q18IiIbbj2tbJRq&ldgX?CV5W5PW^ETXra>rBI!c`am z7V^stP~`z^#nXIKunpVkmdeTjI-N(^)s11_49a}?4gUU(;dz{w$|_hPuy0dwovZZX4I;r+9DyY z_upnneuy-7po(ifQ)oaPmJ+vRL}@wqR-hXzIjdG-1Z$uZ&k3yK=iquy#70~pq9XMU znO-_|CW>chQ=z>J=tLLOuftjFk#o;Ef=WRn={bzfbKF9vQg$u7kavxedBbt9WmZkYu4M8?)^pri#%LbMOjkYUhUJ<$s*Rtv zY|A^V&@*~?MIn05$(aiMbA+-`Ev=gFMT6E9Qgcq$D6SZ;CC|ZT)LXM?{*f*h2>rU1 zH8WPJTx>eB+}NDu9?kX@OfPg%VgKmt;VvB}o%L$X(}L7zE~lVo6$a)_Z_UXq8se>I zx7s> z2NimK%aozsfwphwtcu5DF`sCKVc&(jS{UkNu~rV5e6&q1(VlKR77e?QS@tBXQ*ApJ zRrp7B>RNo``?E-QyFtnWM2b_t^ z6k=XPEG9_YH7nJkr?6w$GqTsnXOOR&k;_SbNXBhLlqgGtaaY*4jktm?!WW%urv0Sn zC>-cIkhh9VQ$L?Wp(zcovLIyF7-e(Os8o1siT+?0oy=T6A^l{SahxKrHKQ1>mUD(j z`V-~m(NvpckT$#*PLcN{)ZS;CH(F2qS;x*>ZYkXH3)L+RuW5K);h8QZ_Z--*@b1Vu zEMPOWB|0!mH-`e{zFV`lXBJF%N?4D(fyAyhZ$bfu;wd`HK3@jVUS*YN}VP{%R6p|Dp9 z_5Z)#qUTK=Z^`fkrZv2+<41UhLDn&eA8YuDj-TRPlB?rAyszT}{7lEsabCwSa9+bL z9lyk{bo?6c3X0$8_$_{?Fge)m6_!8LMz#3t~teO|{k~i!X zn#Etm2hI>92~x7$?3EV6jc)D~TiAEpxH!26sWH#Y3GIeW$xR z%O$oS)`p7dNuTlCmBM7#y}D~}qMeb=@-3EwCbX+v#@~~6uFg+c0W#k*P7`sv!d zle6-*MK*lLR@mJh#XwF-h|wphIJ-L(wJJ*7vUzRD(auIm4O50M1UxCuwb>7PZ#$%5 ziab{`cILfCCXT>=-_94_?xQO5| zM-c{wFvd}D2w)r&d}5yC2&Lrk4Ce^vonwDRSH*L9$)o)oTJxsN_zwRJBh~#Elpk?$H%Dalvw2~;|WYPrA{}c z&hXm+_6dresAF&)yXzP_BZ&5d`Lr-u$45>@$5Z!* zQm10$sdV!pKA!q$^Fd2T)3G`pcn4$Ycv|yU!;|TF9eYIShIK zr<&~C400{S-=7l32=!)t#(JpzQ#`*&+s8RR$4`uw&S8nGIPIOpGFO_PlZ|UA+9W3> z0ro-tmjDtPE^4@>G^}WNzWGmqO-cGmp1h1J#IWi5GA)KSu(y!|?br9B@89O@`vP91 Uw!p*-v=*T=GJd*QZaxG24@I>7&j0`b literal 0 HcmV?d00001 diff --git a/target/classes/com/soft/line/util/MP/AjaxResult$Type.class b/target/classes/com/soft/line/util/MP/AjaxResult$Type.class new file mode 100644 index 0000000000000000000000000000000000000000..79890bc60cbdb3401fd93d4f4617736d5136fb13 GIT binary patch literal 1594 zcma)5QF9t)6g?lXK(?C%uqCBZn<}+HY@nK|l^CH&Ee=gOY#S%ziyN{{H?vusW$Dy6 zAN?^tC{^p|==9O?_vowRxgQxzMrUMa_FgXEx#ymH@3+7I_0z8aHt_KR47?-eT@yF) zUJAt&Hce#lzL>2vawZQy5JWSLy!cicE8=gZabA2og%1@{_Jel2W7`Ue`(J$SDp=hh zaKpCmj7IKA;c9O%Jg$v~52Kpz1#WE|d4BEgy;|$YdD3@BV?QcMUW56cwEEi$$?ct6 zt!*+Joqm6(Pyg8Q$0Sx=Rx9ncdJj6RR{nHu;-n^^mTI{&e^#PBJYd!39#wCTkN4g1 zzO(Q1pOmKCd8p7R_l}&$PR)0M!)S3%qDcVdX!hbi0*Zjx~DZ5owm(V0>Jf(l1VfVR+yLj<2v_ zdxwD&jYF1BlyzFXT;aS;XE1O_qf)(Im+{Tnn`FkGFeAM=;L^1~@=?sqnZ7#IvpFZ@ z7Vn2?569uaz3s^omS5bTb=iT10xnp1S?+PsLI<}~_(pHnNDBZxyU?DEXwP1V$jP{X%mta4WMBao@d^|!F?y9=9&>`& z4~RcU;u}V6i8iUvio{;-$8w?0jsprM%Q(Psc>UjA(LiGeV*jvspRWgUK(%W zt&`-hxG#A=`x(YwE*;O}w`W**3RA~t5?OUk$Ci#4jjZ}p$4fe1PG;2~I?kkiAwhh? zPh>AKfo1O*6D-+#$q6#{Q^aI^)9vMT#Y@O=d#hAe=O&uG0r8W`Y~Tj5F}#hl^d_?m JH1JZh@Hc+(MmGQe literal 0 HcmV?d00001 diff --git a/target/classes/com/soft/line/util/MP/AjaxResult.class b/target/classes/com/soft/line/util/MP/AjaxResult.class new file mode 100644 index 0000000000000000000000000000000000000000..05dccff36caf99596dcf4a175f407221e45eb36f GIT binary patch literal 3341 zcmbVP-E$LF6#w1kW0R0lNLvuliU>AMffOvI*b1acX;ad)HvIsC1E;%r$TrbGa=+K%f`6?4h1k6z!p16bmT!oyj%6arZ0Ns%Wj{B}-4Ny4gtclP3%A`niis!~pt zWL;NuflaznF3P2OrK}ehVEmKsLY-M#( zDbLD_C9*^^TAsMb#E9m$(Q7OhiRi9OUR#ap+F2uBqIL0#Q7pwLr{jqg`NE8%S4sx$ zJ{)c8wVTs0bSHI_m|>=<`yN3ko>jd-Ih<6CWo>C%F3YQmL75cD-aio+wW-AwC2tIw z)RtsJzCGvmS1MM{kn`szyCUxYEnXk%=DjqSmkAAkAhwGVE5{ZSZc z{`9)F$3cP3W?OLQMqp2~fXrh_N2$K0+-9;A&*d~Vy}PfkPat-$N3AD)i<{Z9(yE~p z6cT{6&OL7GtiYCNy2n*U+k$Ki!qCIkR$>eA*C(zY66DiqH z=BTAnyamO`YUf$FIVG>L2B~dQPu^I|O-56x@3coJ+;rJUT)hj4nJmeBbY^C1h6w+z0W>yx1!#0CYXfeZf z-<`p}pRgeo3GBPY#sdy=JNz_G(BhNCCPVW{%5fHtVcKLBvtS)o-43g6n-y(}K^!3h zPY_Zk#J{xID`7~&u!JWi3Kb^xR*yq{kW4{7$rK+au*-}S@JE7GguWq*FxmM{`zg~m zVTXEvo?I;{5{y-`ft_1i&a$gkl1a?k-ACdlSKf8RM(VSX{4vo0=$s44Z^r5XarPM~ zX#*wTqc@=S8d^?&i*T&>Dq8D_t($mTEJquUmY5Xj&SJ{5W5OMj!S+nA8?(0_ z^BoHAUDC#TF8&>MVtqEc#otNsiN-1Js6ktW{m`LFrEipCYT`EIx)gUdOz~$fimlC4 zJm#dhroSy!Y-O5m{e4Bnrn|#ta+_)%s1NB%vykZiX&lnFh9Uj<|3VsfLK?GG(;4BA zn&{>_rT=HN;}?g$-=&*zCw8}Pwl>ktucVvbNH@Q`BIvM-a))lL6P0$@*9x+|iXHU@ z`Ga~h-Pm>>2kc10*6DkYTHr(VW%=6)jQjWmwNvLXPtdD}x*xZZ40S(#X6dfs3qa6M KkQVGbzU@D#<8Rvl literal 0 HcmV?d00001 diff --git a/target/classes/com/soft/line/util/MP/DateUtil.class b/target/classes/com/soft/line/util/MP/DateUtil.class new file mode 100644 index 0000000000000000000000000000000000000000..49d4624ef00e3306ec5894b2bfd5983ea5d6c843 GIT binary patch literal 2024 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 literal 0 HcmV?d00001 diff --git a/target/classes/com/soft/line/util/WebToolUtils.class b/target/classes/com/soft/line/util/WebToolUtils.class new file mode 100644 index 0000000000000000000000000000000000000000..a48e72ed416daf3ecebabff1f1e89cb9ba11d6fa GIT binary patch literal 2628 zcmah~?Nd}$82_E!W$&_F1y%tUHPX@mg#{xuFbffrSYDJD(=xj(2e`7_yYAiPSfZ5JDBNDXlm4c=PoQOGUM#*z2`jVd4A`4e$UJO^TFNU z0W{&eAgXa7i05!Hh;sC)N59$*1TYxHA-o>MVH^qI4fTFg9Ul$gtsqKptO#$zP>&%E zF(nxeKq|G707lh*OoOQ`jw|7K0Pz4O0dQPYy$>4_nk>^Fwul!T&o%!m&fNmK3T zg+6D@ObKj=#_Wkm${ukdaoR=Fjv0>}l0*Hr9UtI2)gllam5vM1(JQdJx+Z$uIB7)U zhBX@LbCRYtN}Uybju9L0G7|If!S<<`OgN@(r8K-NP-LbKnbxp9nd<3t9X=u;`1jkX zZezlA@-b8mrv*wDF5hpboUCfG5}8(dD(h52pwLVh!^26LVnjs@!)aaEm1mu$DAKVg zS3yZDJ<*X+iUJi`EjRdf%4O0}u2aotTF!{T+C`Xd=}g+m@ea$8$q^$am6GL#;E|Sq zM@|V;E~@w0v2p3-*r2w@q{rot=HygjAuo~TUD>sWm>jLChbs+H3G+}Ep==%_)hju)_9$9s5R$5}M$*o8&`%}&*;&^4UXaULHqVLCo^ zPbRa;*6|TO)^S0}pyMJg@nRjHD6miQnLyahx=PPdCv|+Tto*}@z@(1LxI*sYwvI1w ziFKGW%;Q7HRfT*_8G4$VnVE*>2K5?|I~#O-iLW$#t>Zer5m=K0Sdt=Q|9$!P+?DHQ zV($ByxtnL_?wy~Ton@6ZZrf4cz#rrP7PTxJ7b33__N2}Duq3D6j^1V+H!v+w^@Ijv zi7&$R3>}v-M__%UbEQnt9j|t@?fWj7eZMYG-D|qGg4i4QnttCgtQzr7c4pD%x{;Du`KO0)6`9F zGY4X}M)3Jn7igUm$OBu(1v8&;Z;r=A&5?jYeB&0PgP?sOT z{K$ShP4mUuf(`uERr6B_6hNr%=W`2p5x&{RD5$*+@e3CoY~|DM3JX!kwVqW#J(Yn% zG@y}M%DCA*0ZM1#xq;v;yczgrW>GN1!z|EBcwGoTR`6GhZQOYwR^WLq{8VbJFO9p{ZVFp3Zk0|i9RQ}{5C@0Gq3l*tei2&B34C_!qIOTM? z3sXVh9oz*_ik*0oSE&07A?~9>X!O4jExBl_=A+TvIEqvZB9DwsuFF2knh;d8k~h#{ z@fYLKsCzG@cg|u(bjuyA6dV)hxF{C*10`KsGbrt@3xzURHI0$F&}w&al;W~xU)VQq z(4|(cMR{{UxFCayX>3<-Uj}QM{b7G7?AmSQs?uGp;cBhBS{e3t{)%;Be+KJsJ^cCB z!_&90DoRPHijvUNon&zXx4&WI;oEp7^lS#3YWdG#GtX;h7?qdP_$t}+xiJrtO;sIU z##utvDj9thBX1<5txQ%Ic^x39$H?j#5_y(HUc_#G0A3+ZJCRyBviD#bZMccO_yPNH z7q7axImmn*V-3DUTR)LnX!kO6xdZ*QZlwp6I6>PsGF-)i*h@Xd@de_x($j0KqkY6u zKHtH9o&p{GtDI*sUL!_Uzmr-j=bND2hsKm^h(16>LsxeFAA0|R=U;gCXy`7^rT8hD K_0Y_N-v0rVw0&{_ literal 0 HcmV?d00001 diff --git a/target/classes/com/soft/line/util/config/Swagger2Config.class b/target/classes/com/soft/line/util/config/Swagger2Config.class new file mode 100644 index 0000000000000000000000000000000000000000..682055f28e9a3c63c34cd71b191eb01df22cf9d2 GIT binary patch literal 2475 zcmbVOZBrXn6n>Vs4Pi@5uodW=eWL*+H$k8U+FGELR%1azsc3E8Y;KYZo87Q`L)w4f zC;jMWr{jzt)eoT~GyVYoM;(8Kzu7P^+72mi8stPeVwC@L3pV@JO95gs`aQ&(*M`Bc)?mL)$Ik2zf_Cb97)uL(8n2;TldR zg~K0}3Tf^wn`xU)B1zXW?G@7#YF|5Sk$K^37))Ajf%$G$GMnsJNeY`;u9FoxmMWXM z9QQ_MgYA@t6PCwK$(Ohs*qb-ldWwMS-sfUl5{c$8oDx1ZX(vdbyf))-wyd?0V}8k>oEVGk34D8E!h{ zOE-(+p_6qr3>}7sdz-@Ij9{zFWEW1kCC}pbg<`1t?NDQD=BBA({9U0`2`YI(q&p6PgQ;2W4a(grMK3~-nRvKY{?laPIBPM3t8;hw+4>`ZlEr}VGy zetPr$t2f{N@b`~D8^|F~bz40%Ak^+!UdrMmW40>Nyz9%!i9|fk{3=t!B@xTZf^A?; zUB2Fslv;u*71FdM^@P1dEx{ z{M^#>5hA~FIUQt71vnBtris#zXNMU5r+xlk+qe1L4#=23tWyI$c}q8_X;Xov>($DO zLcH0C(A|n$;u|GWst2Z%p(@|;KoZlDHhsQmTI*(xm>!QN>*-2KrDjtDfhy))H)nIw zoFV5p+#U&~rqcCfcVxJ4d7`L(Su}J>?iKunY^qw7 zk3Cz%!~rku&+GmZRrtEn!ay{h9^C>pfuRyPei-^DDJ6wKI&+b}A=FmUZEYM zS);jia0}Y6v}nRr8ry=y)3`=!qj~}TxK2BgB@EClWt<6|0sY%(TKx^pTWBFStrfIY zphrTl(OyCLH99IVDmd{ASya9Ek$<2E9q2_D`skbEEY8vYWt`vhVt?($LAtB(3-_?PNGoC<^i2^&RD^l~MeuQ(u60YAmCaWCEuRDhefOip z*;;8;ECw>S%$zfG^7j7p0$>x19x|AAFykSCS!?DT%sW_M$ZX3_H}Hq$M77@;`# z*+71jG8bdWQx08Hp}M< O=wp>BWSAtIz|;qZ?wg1J literal 0 HcmV?d00001 diff --git a/target/classes/com/soft/line/util/exception/CommonResult.class b/target/classes/com/soft/line/util/exception/CommonResult.class new file mode 100644 index 0000000000000000000000000000000000000000..4eed1f72c7330f84270d44ece0ecc23fd15a781d GIT binary patch literal 5806 zcmcIn>vJ1d75}ZY(n|I^aa7BxXrK;FiY(c2DS;N*apL$v-1?FD)yA|mYk6ZUktIi# zQYSnLltK%H_p|Vse8~ss5EtkS17FGve-owr&b_r`?^rykmWU5zA4AQ zB^%$Cg=f3)x=`Pd>7Av z;+k{Q=_@*=mA>&()m?Eb{RYBo8!HA9fxX#krBGVoRq8mwy^mgX3PpF>z(RU&564F< zm2yS;=padAw&SjU(7*%I8?a&E#x9ZnKiu@QvAX{xJXH3Xme(IPyoYkY54hnneXLep z+%1ke3?5vs?_O{E0Ufgggf8sj%mK9crVrh8iiKsT>W+CA#IBW`8eyqYxGnc3ezja# zDl9L%C4$q6Th$1gq{H>VeNZN7Q({s^Ku3dsmlksM9S4ww?fS_J5K0P z*rIseM@(&~F&Ni;MYk%pKLTyNqFzKai2Z(KcIk^4BMwbv4QOEKrj$%{t-x5v!JU@(kpH8TE4>D7ly904I>r z?EVhR9Ae(-AlG#Bmj0*#11+=VS|#s}5zq}B31;V%^rVe$lx!Twr)@le6GY?ue&@S| zpV;^*erDrKxM1VwcutfRE&Rg9FNOU@A}*mNy&xBYp&x3T(wV;o~c;}fGJ1`aO_O^lBW z&5gd|bL{!4q4~KB(=+3XA`l;&o;g20GBP^FQ_lLjTO$7S27AfB+JUZUNGiQ-koS9X zS9x}c$;U4cMo2n_R7jde{j#uNS{0q<`h`|qd zv437!{DNn3ffhsDYp+|(HZ#_%jCE>R&lpeP83t(t%(e&2GDtD|%(m%gX_|M=GkrD~ zZ04_s8{pc)YvBbOQmNO$KHCs%KL)7O3$1@!{~4u!(9=H>3{C6LHd8&)5Smt956!EV z7^w$xRv9|y8OnKqcsXok)iTWtO$TDoncI$`u6jtRKF>r;V?M4b4Os7>^)Ilc1&lye z7QLDd^Uw&I9BONFXu09gEI7DRc!L5%L!)rVA9b8Xtyw*&eQ*wtgZSv;&Pa&2ny zjgM>5kh#KoNTG)KE0;Wy`7=U0Z)$tMLd3(0`b`y%;DRB;rir@nPIX82sg7gIYonld z?K{;a_N7h(=Oq1`!nCJW)C+h-6=c@YQeRnH>D7=C-A2f$hmiI7WzWY&BGqxCih+x` z)XYc#lJ_lY9w`z@JxYm$8Bs83_z-oH=5zw*=oKFp zIyPgDzj2D+$!7k5hG9@MTgFOyV3~A{9lEC4QNdg$f?S zS4hRw0MR+T<8_19`wI15p+8yJR_s4GWWo6Wofek(FJ^pzM>QD_l77-(VA4%_%IReD z6=#s*6_qSYkilUZY*zn@Qk0=R+0aM+W%Xvyi>iQL3JA?;kMFsInbv z?_XunV(r-y2V}NK%+VK47kqiUel&yqEeb4B%BnKctAsgc}Bv48!=4 z3hLh>VI&dp1$-H^k>!a+17dZ_om>jjalVLkHnC3U1yoPJhohI@#iNPT7Cs?K-NIvu zW18;ZPvVoBP7421q_^<+PL$IH)~}`0Ub5;KBpkW9@+d4aPJ#4IT34^W#z$eM_dY&? z5N!(UGFsl#F7HKogh~V*>KQ8C*TJGlDe9=v;n~)EY3@mLwS^TD3Q*P2V@)|&;@UWK X_-fsWS%>z8>LCx7%FMMqmT&wIK4_65 literal 0 HcmV?d00001 diff --git a/target/classes/com/soft/line/util/exception/GlobalException.class b/target/classes/com/soft/line/util/exception/GlobalException.class new file mode 100644 index 0000000000000000000000000000000000000000..eaa3b6c14b4c0955c5b503e8a397621d16663be5 GIT binary patch literal 1180 zcmb7?PjAye5XIlRiA_?|gp#x&w2(ldsZ-S#ZbiMIf-0p5(W>`Nx+Ja~8#xZ}u|NV< zaNq;*p%8Cv=Z`{(#ASAOH1m6J#{TvD$4>yy&?>;h_9`CWVG$M@Iy7~7WZ|)e9f5+1 zqA+?9UMhjTPA?p~qwrnq`d*;iaqRi7`qWeJV=oNcljBM0p@7|2@$@awZv9VlF4Ze_ zsPcL|?5gNoc6~Zn?}R<+U&zSQ?<|>%2i{2FV7a?je%O`%@x(1Hn$Nw!i;o2MTgzML z2HU$3D4(i$5MI8KksPX6MbxggI#=?8bbT50-Lp9Ig8rc{wT5amlKsT_Uj+iS`L^>x z6n@lWC7t=69FN#nodeG*1f2QSO!3B2ZKHS=j-#G>>FFI-7B+F9joG+`f`unGo?_R= z9aMDK)S=D=E&c8bJc0Ub)VJdx_J(S@c7ffctl6sRn!nKLWPcU@Kr?JMFq-^*E&j;@ zh8}>oJnu!UGTMB(JcZ6WUm-s8V&FETnIubC=;;BVUr%nD0T}-ky z&U0@LYfiByc+Z*T^q&8{BL& e;WpB;sa-3x%T{OwBQahumF^o= literal 0 HcmV?d00001 diff --git a/target/classes/com/soft/line/util/exception/IErrorCode.class b/target/classes/com/soft/line/util/exception/IErrorCode.class new file mode 100644 index 0000000000000000000000000000000000000000..c8e3f24655e70a5354ba1b873204ca5cb9f41600 GIT binary patch literal 216 zcmY+;F$%&k7zN;$T3fAy4tfT4F^ij{C=?Wjo}kv>kP;I~Q}JvL9>7D1$yA&kJU$-p z^L@PmtT9S4Op!69g51_zh+(!^9_sQ@a#d=7QtwYr!3nHXI(25Ha|+3AG%iB z4o{nzY|0%?FPH-oyyGL$SY%8>{oF__IyN#BdB2Qkvy&sUGsmZ$Qdu-J86!#hK!sj+9m`I#x|=f1MySrvsofNM z-biK5jD)^m?{55LZj{=K5fhWy#d*`2G3HZ*C?eq083{*&|E+U390p?Pgpryv9E&5D z!ppX?NLd;tO!sVh;e_GP)ioVzz&mK!mOCV2V28ZXic-pyRzM{dd*^5d?pceX`MOOz zyVzaKR$IKJodwG_QZzH&O4^2-b*PeHWwu9$R+6UJ4++h|-iqvHFUm?56Xh{CZ8Lf> zXmv0_>nA#`4syi{6`>+j^x$KUe`w&*rqPJwq@B`A`}B0yNtojnPq}_;+Yj-wYIv4E z#U2gsATFWjF~1ZIeK@J%FivUc!qXbM@r;7g48JQuD_p(&*T!<;(v|$@-?P>88rt#H z14aI)Tla4Ntf7OkKz`|B;o8l@j~DLW_@b=Y$C}QE7?37M3Y=r-)F<{ZLr`Z1dZ-{3k1g?>@eN{fdVDtf|}j9+}|(>u-xT37$kM zZ4+VJhdDKW&P=%U)gGzbp3#(%$qZCXv%HoS5a%bqmP)^pS(KN-zg22!t=Kra)4B~G zrvJG%NO%(Ja4RzlkR&#RB<_SHZiFNz=?o$-WN+E?KX9lQf2)GFVBdW+Cv&;Yd#G*L0l*n<}Mu@{`6lYGe& zFNkLO#O)R_Zdevc{WAI+fFtyDk$E>gFVa(mm#Ds%@d~}Ut1wCK$`iT`<>7|fM80A} zo>D#uuVP>aXZ2y{jvbs;4B}|Xd7T>L-_kndc%Y`*k3ZIk+&!z%R!}RzI@vG%&0xI% z8wBY0_@%EH3<$7MfK6V%^d*DM0&EfBUd1n6W$+0BwyGPHsXB*RJuc_apvOHqH0p70 r4lR0I$)QzWfyDe5m!M4)=o9RRXsoZH7Bi@W1(j$lk~u^ulREq_Cw1%q literal 0 HcmV?d00001 diff --git a/target/classes/com/soft/line/util/exception/ResultData.class b/target/classes/com/soft/line/util/exception/ResultData.class new file mode 100644 index 0000000000000000000000000000000000000000..71481089a7f3f0d4324667c0dc04a488b4980269 GIT binary patch literal 1347 zcma))-A)rh7>3{JZnsd2{8*}j3Mj~S`B?~@X*hwH)D$&ViKk0h%aZM`=}wLD3XFH) zJ$Rsr#KZ$Hz*FzX_|EKFXeo&YJKyZgH}Cg+KfnI`_z7Seo1@6XQOk;2R*SH(R=|1z zZUGwt6N%pmyzs#9Btaa#tnCSi#{y%!ag<0ek_TSc_4BW+-yc7G+T0hgcq+RIy=nqR zJ820_)la;)o*Q~m%WcR`5Val%m`9%U`tP0|p7>44yU~^}8<~t@S1Dxf#z(%ucs+>x zC*Ag;-+AF3hCG?7$4%0CWaNK#Xv*V&1l4*oZo5hRTDl?Mxm_8AuK%v-zmZJEeeNgS zQ0@^!g-p&uns%*vz|8l3c^n@-^EzJJm&~8Z5o}+jRJNP z#xYUCB&JGO!m_~fe^!vyI_q&7m?`R`Aa)yigo5{~MOfgJSzsw(Vg@4^<-W*K%;5?@ zLg+m?v?U7d2z{=h%ypW7F0G)=JKrEaYqttlB?>;f&b5>};0A8;PcYCd#ns~-+8nLr z%$`DglmiJuD7mG6tEdWO6QHQZ4H-O=`d;+|Oh~ zT9f4|JKteCYo{=DADq>`#4D5s*66v;`EXhI4fcOi2XxZ+y~dQY#!ypDFZI<)y7~vRoE2z`HXS6w45qlnINL*uWb5`;{{p`0*0KNq literal 0 HcmV?d00001 diff --git a/target/classes/com/soft/line/util/generator/mybatis-generator.xml b/target/classes/com/soft/line/util/generator/mybatis-generator.xml new file mode 100644 index 0000000..529a974 --- /dev/null +++ b/target/classes/com/soft/line/util/generator/mybatis-generator.xml @@ -0,0 +1,95 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ + \ No newline at end of file diff --git a/target/classes/com/soft/line/util/jackson/converter/ConverterConfig.class b/target/classes/com/soft/line/util/jackson/converter/ConverterConfig.class new file mode 100644 index 0000000000000000000000000000000000000000..c9864b32635f9d67d81d58ac6c7ff5052e556208 GIT binary patch literal 1391 zcmcIkZEF)j5S~r0NqUVo*3>q>RI7ey1znILV$y=P2trUWB_N2hIXCB~mtEQ0tNtwg zR8a5-_@l(xy<9x=0vsUyf!jVT!bTac`%tj#n?97R zy;+7^1WGL-h1nxe+}iFE@b=X^PGGq$B!8X^dt4u~UWAdAwhCC(Wm?$tDCn8@A|~*l z9jGCVRo~DEaWpX^q5~Ej#Y)mZ$z!e!*K|Mg(CLe?NnkZLTFCHF9WcYkp9wtN+HNZy z()fe@+}CW#KPr8MT$*QunavX;V@4w;L)vi_Hq(e}%+}i6 zL#f8gL>e*VT@eeM$zv&%VMZv4Be^@Lerfn8L)kc$KH*Fv*LpUIXP6Okog2p6f8B-a zYoy~ES$LeEcbZ|rN*=w-tHG3DPW|^WA?Jl8N z1s|3OJUZ2Grq?{Rh`VP3Pv2eZO!%qs@0(dE=(6|GgdgqFbCEKUzO7bZCyb2-;1I2*G#OUPNC1B4>^z`E2(hC?5 z#w4Ao>-YB`0CuqEqlHI4mhsrb6CX_%pL$sFu*%TtsYKab zhWh%(F+*ctpGbz;P$lyHWIT}ONDN}C%!N7<@v$(<^jl%&ep&4@cm;&v`Fc1K7lOwk85Z#FMqbJ^9g_&H zR8LHlHFXWn5WJK2OrIPIBgT^6r3PPAbw3P7GP0#^_Eb?~X!q4H5q4roJg)Ro077ks zJpJTsoI3T-+MJU?BTJWMB)5MZ_9{C02)fgjcFC0A&rBUCH|^#B&g!Le+rb^QJv{4R z76G}Po&dv}+yBNtdbw$ao!hu(cy;48KGNP`jTW>8+6r3UIz@6zr%xHD$S5{9ufV?2 zrG~q7IxuJ$9XdNX0QWFM8SOCwLOJql%4!swTi;OoLYFFeJ|i#YfPzd=+{YZz<{gbu qf?$sn7YfB~icYb;x%CtEOEjict1Yz))lw^P4Lr!&Sj59DF8u+8Zti0M literal 0 HcmV?d00001 diff --git a/target/classes/com/soft/line/util/jackson/converter/StringToDateUtil.class b/target/classes/com/soft/line/util/jackson/converter/StringToDateUtil.class new file mode 100644 index 0000000000000000000000000000000000000000..b872e069ad06f1336bd2e7a244c95d1325616e0c GIT binary patch literal 2157 zcmbVNS#J|p6#j0!j59b8l9(+(Q=n}UFm73klduz#U?+e>z$~Q`d*V!(#f--(ba`rD zBlWGSRJB#Bir2K264VHI@6V_z#Gh!>?_QhOL3ygBxpVG!&vw6a&iK!N|9B4I7{1W) zHb!)eVob*sWaN_7F^&njT$RhU2sQZ&z0z=9hmM?v$yW5>hK}u+(r{D5Ee&}cTQL&D zZTY?4U=gymcVEUb4yeWO9s|Xnw<#3 zi6(Z;*a%;rN~x~!2Zu&qf`W>>@MB3kjPenD}jNN>Ip)0(jj z)<@hHXv+m8DQlD!of>8}SQ;kT6dLxcD&J)OSu>dRip<4uOwvfcV}k|qtg5ExRIFi3 z)+q5N!-r-3I1b<)4RdikfXxVTIB?_eP-et99>R~Kf*_76<^?vZl-Jmj#-9juHZHQp zM;!aGKaNK@B(OuBZ$O&BzJ}?jZJQ;-KIfOJj_C$#p4guarP>|NS1r3}`i%Vd(}h=G zK6~}#=a=7q{qmb%UVisOI*!NqG>*^YH4fl&fv!gQMkQFw2As2;vTZgWCLZ&b%x06t zV$aA(+HumAN;=1Y8{n+Mn<%Td4q|II_H69>M&S7Wnhi#5P%<$+XBL9jwNdRPdwiWv zjW*7a=a*7O*(l7K96iVJ+)7GX9IX$P96Yv=W>wA;ejw1@Ja`vo4L@f-teS4Y9Oz?< zhB>ni3GS`W;`&~W+Vx4~$Ah!jT9yM-OD)mtwwByL-xveW8+O&4m?6=6u zW>Zo}eUfMqrXIgc5#^lIWt7XNTNFrc6rpLV*EJHyG8TBRN!l>EDSo$m_yDY>>}~ml zrp)Q#`Yv}Vz6IZr{$+??DYW1{u2BWF=#l>Yn)VCoz&~bAUPUB5@&DjcX|5I($qjlJ3%DC#56~ldf*Ep2GXg31uM|JFD)|qHM22YyAiNg@&P3w1Mx_ayhfg`$f6Y zaF*M1g4JB*pQzRhX*e%+FRU_VsD8kj<09il1OtP0ytLL7mP!b?)*gL^?fK9OcH}#D wE@M|NA69a=k|Rpqt>mbZ_b6FY@?Is!l>C;Ie@B~aFo8yc?d5KmSPL%y2m2%m%m4rY literal 0 HcmV?d00001 diff --git a/target/classes/com/soft/line/util/jackson/converter/StringToDoubleConverter.class b/target/classes/com/soft/line/util/jackson/converter/StringToDoubleConverter.class new file mode 100644 index 0000000000000000000000000000000000000000..a035b532a0adb7a3f3eebc4fa2efbab9527b5c2f GIT binary patch literal 958 zcmbtS%We}f6g|#s$PnnXK+B^%xu2n_@PW=1`1N%B;jX5$TaI%Edm}vZpF%7{-a7@m!x+o)V82 zR;7F@lCxZAJki;?G*%iuvPNZ-L;X@0Bylj$_Zb3T#PD=8o{Dq9Q;|(Pp}$p2Ra~NU za$T6DZ0s)rL-bnOQ+@nS7%`LdHZ{4R{B}H*iCs|kDTeMyO)_B%L*iNOXTd$Ox`T9R5_RKl%;TpODp7gMU zh#X&@0>j{ceq}+ivd*w~74Hnsuh7VQ+97PvvUWiGL5tiZB*%1y6mddE*xvpE_L(jX zT&L3&12@p4vsV>Rbdw_5X+%`z$S){r5Vm)|qVb6?b@FmaUabl|nM$#Y6{6j8G)4iU oeNw#b6?X}pVt0Gz2bvdXT~@8P)b*-!t;jWSr)*;tYbD_Xql}nLQxOnBjXDs*CXnm7UD zoHX$RXDYn2SVfMfqPf(G)XpH$el$K-eU1wf!tM)tDs2evXun9`w`mE@a;GMT8+JE27=nIB)o8swAT_}PuySNT54 z#@aBkWa6%kd$@1nfsI`}w6TXrgy;V$1fhA!_-HtlUP9PadhCdq@FtQ~3_}&gxj0Wt zbutB+wCTsMS+g_3&Z2?`6QKw4Qz|1*_PQVb+E8dhSe^+T%imFJ5nf!r*X{Fyxd>8u zbV_J-`v3SMtV50eu}&g9L0|H+#kQU&*RafIyJ%p)!cha)u*yR+ z@JIFr`;Gkz7@tw2b3RlqP<0=lbGm|T)H-fMfphR0~|Dq7(-%WGJYhB+%E#=9? z=@fcmlCrhG7!1){X^-^52Vulm((Bable+Z#;YcR-g0xRDbO$QUg`F4@*R{8OL99*6 zixX$&(5ZjY=9p|6S$VCHJpVDdUDKHkqF>8Yu6D>*I4FI+R&MNz{~Fqc^W4KVbOSu@ zVFnR-zB~tp7ytEVE=W$@Gi+VOKEt!Cbn=ll3Cpyy9ng}{IyVW)Go2wtoRAT=*S>(A z)1`sybh={T26}Y%rUew;q=+^f5mh-?e(u{oYAFDo-N4>(*jSXQp{qGXtx}V rQGnh0WBBkvDv6;Bj#HsBGV>|!C zUz8OU3qF94LR>qR8i}m1qma_j!^1!&k5xtbs-6>t{=&dX*iVnR15>Ith>q+!MV_WmKVixGWKJ_8`o2z6RXR_ z37F@ki61x<;a$Zlay%8yq)w!E28s5g(W&Z3i5y9N#;6{_EC7Ud$DN3oZ~_sH3UIHx zP%3!Lsm3bRUOv@73Y-R5LCkzPV*DLrz;RCr^_Qih?5;#{DY zg+iH%Jhth_?^(Ai!uFzyM`NJ}@@pz1PxiW>32V1E6mk-3Q=wzYDPd!gJYT-o?Q{E? z2vT`+N!aZ4mwgk~p~8Pz_84G1YHaJAIqZpj(oY+~L@s1K6){R>xhe za+8ewg-;Cj&BGfQ-%z1z4oWvDyU(w=Tte1r9c8wAd}oVE2UtTpZ@W3CqQMpLYcR6O V4e#Yls$+wL3X9H;_hM_{{$KXU#{U2S literal 0 HcmV?d00001 diff --git a/target/classes/com/soft/line/util/pagehelper/PageBeans.class b/target/classes/com/soft/line/util/pagehelper/PageBeans.class new file mode 100644 index 0000000000000000000000000000000000000000..ebb44c81b4ffe8ac7ce922b1f02696e369115145 GIT binary patch literal 2572 zcma)+>uy^`5Xb-P+i`qpLfX0^NgKCZYCCCM0&O8qU6PcP1Sc`r4XEEv+=Fw9V@LKe z5`7ci0VI$xNJt>~+6UkZPryq6|Jmb9dTLv?Mg3Hy&kU3dlnp#qm}yx}+pHZ~&6eG$Ki++) zp!O8v+l_k5G3(BeS!-LtCx0b>`)4g(Q3yH>$E+y?YIe)v^1?IoYctz+>{_-!OHN^` zWLN8^({5S{mp#)P<#H}hALGodS_kb@Znmos7OiAI=YpV!ErxGtHMC*ZZ6~jAG3AMr zOCQl|yYZBZrVDmmq8(e!vUyyiWwy|$Fe#I%QSTZ95?f)hP-&cItG08}KF*5i#HyWH z&1{h((E`qiO@OraYBj!evNc9`GxT_GS!TV(C5e}J`{t~-bXvNVEXB;e<(xF07R{!4YB}tt!ko8eZUiY@xN13Nw~_u-n*9#9`i4MiPh1ST zNJm-BRN7m7g)6TZdwd2%xeFr3{6=}*#jKh2YWDE>nN@Le`BzP@#cpIv`sCZs<%qD0ky4}GtXMm?9H0xb zlkV@T9Pk*D_*`Lr^vQ|g1FXlefW;W@i*!|_cd!;i0<$qZ5Zg7eUBO%oOQJ4eQQ@Y< zoZy_X#rmq9%TD2vHhFR({mYk9fyF<|Exd)dNlp&jq@VoqQg*VYDG$6deXr%d*F3#esIgN2F|g0TEd#4GWcd&B;B#=R zbDN%QFu#)fCSxga$^3-y_Z0j(g^)Jh(0DP|p$jD_1B(DCyvxVkr^6Myr3_`3SSKlo z8&4i_Fufq7NXiMVhx&*Zf1e|7}_pizU|-1dZ6d}+_nPVoA1%I(A;qri8bjMgT~NFj%f zZh?yZOcr>8y_wu)Cig~UB3EZjCl+)k_*e|#4tcrPC*;l#=MH(f^W=Uof?KZo81Ac@ zn-AI$?ueIrYeMc1hjT}~+&kocG=f{6rZL>tH23CE?zoqGZ$j>^;oSNWJAY#j$bC41 VTb|M}+)L#4b>EzAJk;7p{{uyAg#G{k literal 0 HcmV?d00001 diff --git a/target/classes/com/soft/line/util/pagehelper/PageUtil.class b/target/classes/com/soft/line/util/pagehelper/PageUtil.class new file mode 100644 index 0000000000000000000000000000000000000000..9642b07775a2d5933cdae026595bf771436a2313 GIT binary patch literal 1748 zcmbVM>rNX-6#mAnSzi`noB(k`)6fQD(~|9l^nxAImW0H`0VJo9ntzL#td|Dm5fO`T%{Xw%^Pys&OiWDqFMX%$)CBznMS(di@80HM9zFa4Ux^MY#AN zhXt*FSind4SnsSAa2uc4__Tn}@Od72tlOvyOtf|%2$Wl4=*ykq(Y}lxd;2}^5Zv*4PrNA5db(+;ZV(GpTb=O8jl*Zk z?Gfh=RnT(>o-ezyH;|FLNAVl(F`N@irPVzz@{R;ntF1%tdoMve@&@&qapec9JKP_4 zL3nPUaWvE^o<<7TIwX@85KUw1%XaVsb0^9i?CLTMs^|56cX$6#b`-tl^|>~sfu&`E zg|qXRJKc@vgOiTjKAlx#BwSlXLEo>B?4${7FopIR@lq$It1SJTKDF1Ww(>gP5o6|M zqhZ)kdL&ghJTN1WN=BSuz8&~|PYolM{^Qt8&Kd8l$^HKda*YltWe8emhr_5Nw*pPa zsXdNKbLy6!r-KV9u{;NNu;Jh?zOeD7gRijZ;2!SV*mCdy4+WObM^qb42VY~`!4#$i zO5>bi{8QxP?eV3e`?PhV^s2o%a57Sb2^|D3RYxsSk_gQF8?)J0l9x4Me=MmA%#KD% zK{c|z*a`c}3;OZ4d_HECvaR-1;JR+Ze_yhP=E{;0vGO8wRcT&rHqRO_nKnQEv}}1D z6-LY<&(0*Tjlj}q)|)*qj(Oq7k##Kc;d1!i3H+=FKxu+9N6dAGn#-@?H@or@;#Ue8 zl(|lt%_1&Rb`k?z!Ys8s<}gnu1dBSYC%G3{jZ)#xN;&fi6B+ERlr1ByTVnMEimSgP zd(6jCRIC?pDpsN<=5_`@p?rc&4GsR}Byp8ut}YxSx1OzJe_>S1WV&vOnq?+)$TG8O zT;{KWw{QhZT;IbrKK6?w@;lh!&bL@b7gdC)nd&x@3JgY9KOpWZE6(Bw3zRbSctAhb zSo38(#oLrDq9<^jUbFNHM$YIi@cdnVld~Hu(BK8_Po2xXC{-U8yhyc3lut nVkSEB3UbW$WH5`S>+E+qe~iL!DC*(x(dC*9M~~%w16=(F8T+Wk literal 0 HcmV?d00001 diff --git a/target/classes/com/soft/line/util/poi/PoiUtils.class b/target/classes/com/soft/line/util/poi/PoiUtils.class new file mode 100644 index 0000000000000000000000000000000000000000..dbbd21b84232e54b5196cd1128e949232e1ad094 GIT binary patch literal 18374 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 Wm?)@lE%3{k!Q)U3^CX0dulsLa*KL>p literal 0 HcmV?d00001 diff --git a/target/classes/com/soft/line/util/redis/JedisProperties.class b/target/classes/com/soft/line/util/redis/JedisProperties.class new file mode 100644 index 0000000000000000000000000000000000000000..2415ac3c2a29eac884f91863b04e34cb218eee45 GIT binary patch literal 2023 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�^RVoTZH8mvQ7W&UQ6Y4wB8BMUY%4NcOZe6$_BpWpR$68V$8P1B0kmREJJP zgRE3Zi9-r46y3gbBH0C|$*vLP}yB_G9H zI(sD<7g~4{RauZ9jO<0yAcgD3!#5k&jVNZlTuPN+-C5T5~H+_X*cs zewDQ5I(*b|k+pOY(V9Iu)oyNS%3@I#HSa9ijGf{bi*>XV=D&-A*YGb$wZyB23JgBC z>#~a}iqvfdw}t4_Y;`Z&-Om_%j4khD%JLbuzaJY}?_zl=%Pa6X7ug7-=>V=L`MD35 z=zDMjZqzEiM^j#iz6UosD&99)#TWXh_z^AP)N-vnHxH1nQ&s#1a#NK2Ce6{`Aq(ty zIETo}in;~aoy|nGE{i33sCG0{$|>#@3y=2@Q0lmiCtp{|YZ3Keu1$5&j)o!T7E6hx zloAD(GK5c!hBlU;XR8xz_YfBGkD5#I0GawA+dsqv;9>T9h;s2TQ>c>~%SNtv8D&|p z49Ln|EV~`i2vLwEhbho<5RvFt?ci3#=*QDW&c$uS`ZZ$3;^?`!$MjFoQoKaUAvMcE zs>?-c>Hh~z=Q3Fnn9k+jG$nD1=rT$wN!?4iFR|6*Z1)uN%%|D%2}ZOh+5Ra;q^H^X zDQsYQF`jW@s`J3q<-*kE!nAoZOqK5yrduc@Hlc3dn#EPGB}~h9HkTD;vAn<8iC?5w zxV%0Wx*B>~PN9)EwM-aJp-JIRRLfJd;=WpUm?39q*~+{>isCl_slCC z3PzZaJ)mvX&E#F6?M9Ld>c@~SlMG-|x5HWogA(v8TYa5ieS=x^H<_J%iyr)K_IsXQ z`~rJEM^F9^`#(?UUSRL%8T4LYAbZjE?oMv{_vp1Dj!=*57_0*9Gr`hpUHGqc;Xgw7 zhX`9PjM+U8v!{fy^(Z`pW&@T^Gd}(%7Hv0hvvBn+(*+|(VT(=q&W=znvE{9EjInwA z3EakUB?G>i$|VL$36Fc4PvQJL3oQ3qKvcFa_!utO9S~d8^=5G)?eSc2m85h!zndF8 z9u11lGE=s7VY*~bXUQQZWnJ1T9Xh$_B1+RG8{Z|GFOlRgGa-A0N!|C@_f=ZwHIDFo zYVr@*_f;lzuW^J|iT!JY;fJn8>iC}*eqUQ;hoiib_@!Jsq#QfQyBqKav_lAov_niJ ze)hN99VJ-}<1|X?A_hMG7Fym$Sm)Ai@^=S6Nh)#kZW?5ocTrtFiMt)E z6woT7!y6oRDLw}mWwEj+r>iX|{D?nAdzGC~&t`fi%%9Dp6!^SMmlsedr0x}!AF#*GnEd{2{M;b)S_9_x|RoK@VQNwTWJfaduXjlepQEBwH!-T zJp;-Tw5p|OV|_jATUmCq>{a$<$O>ZD>Jf=uF3P)Hly|u(U+O{mLhsSKIA0E2a77MI zi)K&c7kL=|k(*;Y$xR5wuhA;dNcCOQLphByPUfpL^Vo?v+1MoFyq3cJGKD#(7!>9} zUTsrbM<@A!Aq`Ps{*7GSrcP|H- z8g%7tUeM*AAvvRH*BX}M9QxX6=c9=7h~L)JBKdavDXc3%e~UMVo?h%jIrCPBav<57x^0_PWH(eVZLT*=8eyY*{YSfijuC746+RY2d0ov(G z+Gv2vbR|9H{n`fN9inrCjP%@a$>a)?G z;<#-EoM9;oXxF+WtlsnbAR3wY#FR+M%vUgw9;#=9`D>Unp}?_%nRoA!n23 z29F+2NMyz$6l6FI-*%UC(JX9qlj-UpFH7^%6mK$}7ZDxmg?I<%J!7hV1yCL^C>GV)2HbT<*Y2OX?$VY!3lW$Iqn?OQxSvEN0k-z8T+nIJdM zA$}9Lx8-$(1jTv8PVSpclFIjrRAeB%kZcyc_cXrKcN4o zo$0`&%=CNvqdGlL&lqq-!%W8`>AtJGoV&_@|MSP603O0j;1(w0_%eYACa&NnCKLDy zkL7VnQcol`Evc_1H513v1iGcltYm(Zz*Wq3V;&1}6cf0HQXGp3^kYKamf~2BV?{%( z?mBf1xnkL=>7G;dbxYW$-tdK`yJkgr`nKZlkrQ`mr@0f<|=~bibJMMvQv=sEIhVQ%-bVReA6T%k$ zq=slFyGdlzPQ}#FTO^*vMs3G**A05p&{uTIhP7$9LY|wGy$}R9&nMxaev*jsHlq`v76XJWIE6{N9to`+1NF^U{@I#6 zVKFHmvsqmY-9gHxgN$id%!ImoBY^DN>J-=u5^`Zt|?vKbaa zBieBshQq#7HEg)1PO2hg1M4i9q6}-vE(yYX9 z0Fe7cZ30C~^u5qBoHGQFn)*vPE9ln=`9bSdAn?LL#2XPEW_T_mv;8eGWSmALN6*`tqO9wcTK-!yjtgi=Z55Bo+HmY%Zp{^ zGn)2#YRF!86K>)TzwWpA)z|nPXM^(jE>E3&zQ<>jPj)!(AM&L0 zsqxv7JA(Ebi3o1qWLEe)}fM(M?aWZg^Qd0RZ#P|c&juF{DLbN!X`yH`EbR43y zNyZP+)g-U{a)`t+x+$3~<&SZ7TS@mEq4zaX5o{gf+V*h%2z`qqztU_pfRaWR>D#;y z@{h(HI!+@;5MzWfi~Cr?PyjQhpfq82VS(?42zQK}kB}kc6<&9drQIAY%COYCVe(~$ zddSK18hH-QqojsW<|h_}xB@|=`K`cyI{t_a4-i{P_BCryNp Rc>bK%7cIR36k7Cye*qjA%~1dV literal 0 HcmV?d00001 diff --git a/target/classes/com/soft/line/xss/HTMLFilter.class b/target/classes/com/soft/line/xss/HTMLFilter.class new file mode 100644 index 0000000000000000000000000000000000000000..0db08d40ab5fd9cf06ccbf059776b8e367f29160 GIT binary patch literal 14400 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 literal 0 HcmV?d00001 diff --git a/target/classes/com/soft/line/xss/XssFilter.class b/target/classes/com/soft/line/xss/XssFilter.class new file mode 100644 index 0000000000000000000000000000000000000000..2de0a01e9e5782d28b712f2821b76d84abd40dde GIT binary patch literal 1998 zcmaJ?TUXpv7~N-XVJ@Xy3M~xKVyWd)NUQb6AhwRhQm266qH3SQ%wY(IWK1$hpZ!JZ zL#?jm^4TBda-Wkl9a2WtA}9IIciCru`#bZ`zkmD%;68RsDC6TIiuhyzt7X)%X5do; z>m?NMSs4%T(7@*<)bWLZM+PW(_x%>76j(E zL9k&vp{|irB?PX|H;%1S>&y(Kf9lB4j2!BoduX?7s(R&6heQ^EssHmAC_OrB%1&r| zZeZX`fuW}|Jn~vQmT#R%RwlB6mKPNfc%H7l7opgdKXzph)>5^S-Jrw#GQAx`KeB9B zBOi><6lW8d>6b66Mv9Y&r~>)v7ZO7dD98M$vI5nVe=jBh!;cOoa69F96owu1F(1hp zUt^kL=ic6U=3AYP^abu-+~>X#H3N?cq(ypt?*+TD)}%hP+Ddy~*KbNfrnUwXv8*V8 z2u$pD-OxUf`*vVcZ4X`73oYGffu%^r9p84_hpN**dHxS()AOZiC4T0%-_p{{pIS~= zW;r-QU@k>OkN-1y5YfkxC`Bx9F}FaGlteqEzw0|YR!C{N)K+ zvQ@!l3{`Lmg96u<)n9V78|viRWMH#`C-_R>*7Y_?pwBu$YeJw$1H>W7*`uUO5l%H4QW8&9RD-VH6nEscg^O-0rasrEedB zd`lj5c{7bgvl&(23sr0NR4t}wwhu$vdEz{*2yHzYl?UlWDe0$#k?h8kr|zb!Y4{sf zGxU7Qy4aRsbf2=Ly(g(VRuI${-oAD*%iFsQUU>YURC1v}^L(dz_#Eb!$yF%p;!B8M z_>#d0p9O6k#VFrZunN0^F|GpRxQeU}uG2e1TlrUHMzXJv%iv9llHM9e3D%0_7?`DW&uv-|n<;|YL8EX5JSq!v?gq>$F9j26>z zWHDo6)`VqZP9S>2DLZOKAd_0(vG?qK%a`7sE0tALs%ouK{eBdX~50(0y6O3CsoFO}so&)WBW>zVKW zS>mZ@SF6%n7BIbfQGuy{>`tJ4L#kqB`+@D*C8?yx%B=;d9_~u-Ag4U1ToC9=rE7SW zYnKaF-OF+b#+~H}Ox7v65Y#X)Qf4VVyk_u1IGyJ)H*J?3a+*fSFB+u_M?l==p7w&& z&W2%8SC$K^$PuKUx2y73p_ZJo^RG7SYHbxJh6Uoe%C47}cO1R1(Z4NVR*#cF9L))I zA!*`j0`urepj(T6447C*@U~qe>Az1dF#CVo7Rdh7{R=LKK)T`;EW2vwi_&7LQl;!$ zO75#*ovSq-o+!s9-_3Pa)>O$|6c}resV~BUb<6YYgCNIr{MAxb9SC%%&U1c$Ye(k! z89c`*n)pfSCj#<{W`vNSwL%@Dj%KEhAU^OELJMWQ=52?8OK7FtU5`Q=+G#PK{thB_ z@@xniph4m(HS9dKpl-?>A#{xJA)V;^Q@eEV~F=ZzV=1*4B;9%lQk-bi8Vrdl;y`r#yE>l(3->y^#cE8nz$844e-rn z43bRNK5KRiW2a~qRN@e*gdg literal 0 HcmV?d00001 diff --git a/target/classes/com/soft/line/xss/XssJacksonDeserializer.class b/target/classes/com/soft/line/xss/XssJacksonDeserializer.class new file mode 100644 index 0000000000000000000000000000000000000000..73f542320ea7bdf564ea8a324a790ad6a9adf383 GIT binary patch literal 1358 zcmcgsT~8B16g|_HZfUDP`S1fjKn2=@PBbJwKu8QiloT-miLcY`P^RwgkeR7z{8jpb z#s`0ZKgxJ_Y1*cg;FAwKckb*x=ia&ZWPbno`3t~0p5~Fo{X8DvVIB)u%wr6XJUsUB zgdw}BBIULi(&frALuOkyB*R2aMeH(dUYT6gUu`nw3yN4Nfsw_jb=IfAK zed2gPINq_Af3$W__@AtfUP~(p6{s)LY%mlWeV@UU6YPnwPMS^_@YV&0``SppNAUN; z5Psu|u!eA=uA&C-XAw^6Xj?~4cHBm#))Jou4@A`Dht8;|NhRc4Jzj>DE0~81V3_My zKA3~yK&d01wc+?VcDH|W|Tl++aJ@BeJlLA@n?M@Uzi)go50R>VzA zFqHpQYz(BLkYCnTZ!W`SGfXFPQJTL!=#7Tq#b}kP}~%X1i!0*mw_ zWa+H{(x8Hnqjj7-PL`1!t9}RjMw=A!v}TjTDHLd5ya*tBgFF_Gh)81aE_rFPxz%%| zejxpo_JjD@1ix?*)5TLXCNY(8=1{^kA!Z1dB|D2b+@k$>ib6m?G5Lzp-R`D)PBu>G hRae)}kr~c5SgqI1Hj0_3OZ261hqzL>i}}Rf`wNH{b0`1+ literal 0 HcmV?d00001 diff --git a/target/classes/com/soft/line/xss/XssJacksonSerializer.class b/target/classes/com/soft/line/xss/XssJacksonSerializer.class new file mode 100644 index 0000000000000000000000000000000000000000..1f0c043284eeca39d750b85c996b216c43d5c5eb GIT binary patch literal 1560 zcmb_cTTc@~6#k|yYbI$jj>-_rt{Re;oo*U3{&%h+64BSUnL(V`y@*1WM%wSe0 zVNQd^5O@75L#F73Lt5qQv8TywT&r!>ylg({2Bv$;2V7Od#Jn?qFUKa8l zFS~R?#x{4ixpYFgb(m1QPQZ{Y+J4;%{2gVvWM?&kz)iej_+Cknjq7}l==9)N zVvyNljURB!2+Q`Ru+|CerSOF0%9rP9R=DD2$E#Q! z+D+*nI2ED~17zfHrkj^xpmq|TA%AgK2(cZOJZ58V;^vDBUV zW$HqsAIT(8MFmYbcmlz++0$*)}pUgkgrMi?yYOCnlca znF#|ahS|`ny9L`-I~@?iP{i)|*6WRS=@@e1tnoc=?+WVPdY#H?DbY}^MqdqVz9+Vn z<5E3SB9dOIx?3QxdyGY{J8d*}y&df?IWc^cjuOooV;JehK(jG+_I+66HjUaR2E8g& z^T}YCJZZh+@*r5ub-yf_pw~yIcZ%U^m{-~*XixQ{^%6-I{TcoH^54L|&?bhX7&($9S@ozq)&v9 wYO#0YQnl46wSJJJ8{AIF-OGynhq literal 0 HcmV?d00001 diff --git a/target/classes/log4j.properties b/target/classes/log4j.properties new file mode 100644 index 0000000..014f7e3 --- /dev/null +++ b/target/classes/log4j.properties @@ -0,0 +1,10 @@ +log4j.rootLogger=debug, stdout, R +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%5p - %m%n +log4j.appender.R=org.apache.log4j.RollingFileAppender +log4j.appender.R.File=firestorm.log +log4j.appender.R.MaxFileSize=100KB +log4j.appender.R.MaxBackupIndex=1 +log4j.appender.R.layout=org.apache.log4j.PatternLayout +log4j.appender.R.layout.ConversionPattern=%p %t %c - %m%n \ No newline at end of file diff --git a/target/test-classes/com/soft/line/SoftlineFilesManageApplicationTests.class b/target/test-classes/com/soft/line/SoftlineFilesManageApplicationTests.class new file mode 100644 index 0000000000000000000000000000000000000000..1756dd3be42004b9d10c57de40395eb0b4ff32e6 GIT binary patch literal 570 zcmb7B%Sr<=6g`PB$kvMLxvaia)Ta5XB}(tT!{j;YgRn8~QW zENpSc5X44X`C>yOCM2?bUuvu7a;yqP4g;-?b@Oz#6Pi5XvyyH~F;iCNTx5z@Ql!)x znlg`_9Yg;Q?uRq+Bp6PeY?0+kC(~Ta<+I5jd1Q>`mX!JOf_&&EE(v#r0qSTl9R2&z z4Bg6@r$Q(EE}F^MViz8LN3}fKBnVP(p hJx4yEt|I>;wto=Wk{HlnCA&u1!@7$d5?`QQ;2Wahi^Ko` literal 0 HcmV?d00001 -- Gitee From b1188409730602bcad24a352f7d434b51cb9f3e9 Mon Sep 17 00:00:00 2001 From: matabiri <1119265069@qq.com> Date: Mon, 2 Nov 2020 10:37:27 +0800 Subject: [PATCH 147/211] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6=20?= =?UTF-8?q?.idea?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/.gitignore | 8 ------- .idea/compiler.xml | 22 ------------------- .idea/encodings.xml | 6 ----- .idea/jarRepositories.xml | 20 ----------------- ...__ch_qos_logback_logback_classic_1_2_3.xml | 13 ----------- ...ven__ch_qos_logback_logback_core_1_2_3.xml | 13 ----------- .../Maven__com_alibaba_druid_1_1_10.xml | 13 ----------- .../Maven__com_alibaba_fastjson_1_2_4.xml | 13 ----------- .../Maven__com_fasterxml_classmate_1_5_1.xml | 13 ----------- ...ackson_core_jackson_annotations_2_10_4.xml | 13 ----------- ...erxml_jackson_core_jackson_core_2_10_4.xml | 13 ----------- ...l_jackson_core_jackson_databind_2_10_4.xml | 13 ----------- ..._datatype_jackson_datatype_jdk8_2_10_4.xml | 13 ----------- ...atatype_jackson_datatype_jsr310_2_10_4.xml | 13 ----------- ..._jackson_module_parameter_names_2_10_4.xml | 13 ----------- ...__com_github_jsqlparser_jsqlparser_1_0.xml | 13 ----------- ...com_github_pagehelper_pagehelper_5_1_4.xml | 13 ----------- ...helper_spring_boot_autoconfigure_1_2_5.xml | 13 ----------- ...r_pagehelper_spring_boot_starter_1_2_5.xml | 13 ----------- ...en__com_github_virtuald_curvesapi_1_06.xml | 13 ----------- ...Maven__com_google_code_gson_gson_2_8_0.xml | 13 ----------- .../Maven__com_google_guava_guava_20_0.xml | 13 ----------- ...n__com_jayway_jsonpath_json_path_2_4_0.xml | 13 ----------- ...ogle_android_json_0_0_20131108_vaadin1.xml | 13 ----------- .../Maven__com_zaxxer_HikariCP_3_4_3.xml | 13 ----------- .../Maven__com_zaxxer_SparseBitSet_1_2.xml | 13 ----------- ...mons_beanutils_commons_beanutils_1_9_4.xml | 13 ----------- ...aven__commons_codec_commons_codec_1_13.xml | 13 ----------- ..._collections_commons_collections_3_2_2.xml | 13 ----------- ...mons_fileupload_commons_fileupload_1_4.xml | 13 ----------- .../Maven__commons_io_commons_io_2_6.xml | 13 ----------- ...n__commons_logging_commons_logging_1_2.xml | 13 ----------- .../Maven__io_jsonwebtoken_jjwt_0_6_0.xml | 13 ----------- ...ven__io_springfox_springfox_core_2_8_0.xml | 13 ----------- ...n__io_springfox_springfox_schema_2_8_0.xml | 13 ----------- ...aven__io_springfox_springfox_spi_2_8_0.xml | 13 ----------- ...o_springfox_springfox_spring_web_2_8_0.xml | 13 ----------- ..._io_springfox_springfox_swagger2_2_8_0.xml | 13 ----------- ...ringfox_springfox_swagger_common_2_8_0.xml | 13 ----------- ...o_springfox_springfox_swagger_ui_2_8_0.xml | 13 ----------- ..._io_swagger_swagger_annotations_1_5_14.xml | 13 ----------- ...aven__io_swagger_swagger_models_1_5_14.xml | 13 ----------- ...ctivation_jakarta_activation_api_1_2_2.xml | 13 ----------- ...nnotation_jakarta_annotation_api_1_3_5.xml | 13 ----------- ...alidation_jakarta_validation_api_2_0_2.xml | 13 ----------- ...ta_xml_bind_jakarta_xml_bind_api_2_3_3.xml | 13 ----------- .idea/libraries/Maven__log4j_log4j_1_2_17.xml | 13 ----------- ...aven__mysql_mysql_connector_java_5_1_6.xml | 13 ----------- ...aven__net_bytebuddy_byte_buddy_1_10_10.xml | 13 ----------- ...net_bytebuddy_byte_buddy_agent_1_10_10.xml | 13 ----------- ...Maven__net_minidev_accessors_smart_1_2.xml | 13 ----------- .../Maven__net_minidev_json_smart_2_3.xml | 13 ----------- ...pache_commons_commons_collections4_4_4.xml | 13 ----------- ...g_apache_commons_commons_compress_1_19.xml | 13 ----------- ...__org_apache_commons_commons_lang3_3_9.xml | 13 ----------- ...org_apache_commons_commons_math3_3_6_1.xml | 13 ----------- ...org_apache_commons_commons_pool2_2_7_0.xml | 13 ----------- ...n__org_apache_commons_commons_text_1_8.xml | 13 ----------- ...pache_httpcomponents_httpclient_4_5_10.xml | 13 ----------- ..._apache_httpcomponents_httpcore_4_4_13.xml | 13 ----------- ..._apache_logging_log4j_log4j_api_2_12_1.xml | 13 ----------- ...he_logging_log4j_log4j_to_slf4j_2_12_1.xml | 13 ----------- .../Maven__org_apache_poi_poi_4_1_2.xml | 13 ----------- .../Maven__org_apache_poi_poi_ooxml_4_1_2.xml | 13 ----------- ...org_apache_poi_poi_ooxml_schemas_4_1_2.xml | 13 ----------- ..._tomcat_embed_tomcat_embed_core_9_0_34.xml | 13 ----------- ...he_tomcat_embed_tomcat_embed_el_9_0_34.xml | 13 ----------- ...at_embed_tomcat_embed_websocket_9_0_34.xml | 13 ----------- ...en__org_apache_xmlbeans_xmlbeans_3_1_0.xml | 13 ----------- ..._org_apiguardian_apiguardian_api_1_1_0.xml | 13 ----------- ...Maven__org_aspectj_aspectjweaver_1_9_5.xml | 13 ----------- ...Maven__org_assertj_assertj_core_3_13_2.xml | 13 ----------- .../Maven__org_hamcrest_hamcrest_2_1.xml | 13 ----------- ...dator_hibernate_validator_6_0_19_Final.xml | 13 ----------- ...ven__org_javassist_javassist_3_21_0_GA.xml | 13 ----------- ...boss_logging_jboss_logging_3_4_1_Final.xml | 13 ----------- .../Maven__org_json_json_20090211.xml | 13 ----------- ..._org_junit_jupiter_junit_jupiter_5_5_2.xml | 13 ----------- ..._junit_jupiter_junit_jupiter_api_5_5_2.xml | 13 ----------- ...nit_jupiter_junit_jupiter_engine_5_5_2.xml | 13 ----------- ...nit_jupiter_junit_jupiter_params_5_5_2.xml | 13 ----------- ..._platform_junit_platform_commons_1_5_2.xml | 13 ----------- ...t_platform_junit_platform_engine_1_5_2.xml | 13 ----------- ...n__org_mapstruct_mapstruct_1_2_0_Final.xml | 13 ----------- .../Maven__org_mockito_mockito_core_3_1_0.xml | 13 ----------- ...rg_mockito_mockito_junit_jupiter_3_1_0.xml | 13 ----------- .../Maven__org_mybatis_mybatis_3_5_4.xml | 13 ----------- ...aven__org_mybatis_mybatis_spring_2_0_4.xml | 13 ----------- ...ybatis_spring_boot_autoconfigure_2_1_2.xml | 13 ----------- ...boot_mybatis_spring_boot_starter_2_1_2.xml | 13 ----------- .../Maven__org_objenesis_objenesis_2_6.xml | 13 ----------- ...Maven__org_opentest4j_opentest4j_1_2_0.xml | 13 ----------- .../Maven__org_ow2_asm_asm_5_0_3.xml | 13 ----------- .../Maven__org_ow2_asm_asm_analysis_5_0_3.xml | 13 ----------- .../Maven__org_ow2_asm_asm_tree_5_0_3.xml | 13 ----------- .../Maven__org_ow2_asm_asm_util_5_0_3.xml | 13 ----------- ...en__org_parboiled_parboiled_core_1_1_7.xml | 13 ----------- ...en__org_parboiled_parboiled_java_1_1_7.xml | 13 ----------- .../Maven__org_pegdown_pegdown_1_6_0.xml | 13 ----------- ...aven__org_projectlombok_lombok_1_18_12.xml | 13 ----------- ...en__org_reflections_reflections_0_9_11.xml | 13 ----------- ...aven__org_skyscreamer_jsonassert_1_5_0.xml | 13 ----------- .../Maven__org_slf4j_jul_to_slf4j_1_7_30.xml | 13 ----------- .../Maven__org_slf4j_slf4j_api_1_7_30.xml | 13 ----------- ...amework_boot_spring_boot_2_2_7_RELEASE.xml | 13 ----------- ...pring_boot_autoconfigure_2_2_7_RELEASE.xml | 13 ----------- ...oot_spring_boot_devtools_2_2_7_RELEASE.xml | 13 ----------- ...boot_spring_boot_starter_2_2_7_RELEASE.xml | 13 ----------- ..._spring_boot_starter_aop_2_2_7_RELEASE.xml | 13 ----------- ...spring_boot_starter_jdbc_2_2_7_RELEASE.xml | 13 ----------- ...spring_boot_starter_json_2_2_7_RELEASE.xml | 13 ----------- ...ing_boot_starter_logging_2_2_7_RELEASE.xml | 13 ----------- ...spring_boot_starter_test_2_2_7_RELEASE.xml | 13 ----------- ...ring_boot_starter_tomcat_2_2_7_RELEASE.xml | 13 ----------- ..._boot_starter_validation_2_2_7_RELEASE.xml | 13 ----------- ..._spring_boot_starter_web_2_2_7_RELEASE.xml | 13 ----------- ...rk_boot_spring_boot_test_2_2_7_RELEASE.xml | 13 ----------- ..._boot_test_autoconfigure_2_2_7_RELEASE.xml | 13 ----------- ...lugin_spring_plugin_core_1_2_0_RELEASE.xml | 13 ----------- ...n_spring_plugin_metadata_1_2_0_RELEASE.xml | 13 ----------- ...ringframework_spring_aop_5_2_6_RELEASE.xml | 13 ----------- ...ngframework_spring_beans_5_2_6_RELEASE.xml | 13 ----------- ...framework_spring_context_5_2_6_RELEASE.xml | 13 ----------- ...ingframework_spring_core_5_2_6_RELEASE.xml | 13 ----------- ...mework_spring_expression_5_2_6_RELEASE.xml | 13 ----------- ...ringframework_spring_jcl_5_2_6_RELEASE.xml | 13 ----------- ...ingframework_spring_jdbc_5_2_6_RELEASE.xml | 13 ----------- ...ingframework_spring_test_5_2_6_RELEASE.xml | 13 ----------- ...pringframework_spring_tx_5_2_6_RELEASE.xml | 13 ----------- ...ringframework_spring_web_5_2_6_RELEASE.xml | 13 ----------- ...gframework_spring_webmvc_5_2_6_RELEASE.xml | 13 ----------- .../Maven__org_xmlunit_xmlunit_core_2_6_4.xml | 13 ----------- .../Maven__org_yaml_snakeyaml_1_25.xml | 13 ----------- .../Maven__redis_clients_jedis_2_9_0.xml | 13 ----------- .idea/misc.xml | 11 ---------- .idea/modules.xml | 8 ------- .idea/vcs.xml | 6 ----- 137 files changed, 1771 deletions(-) delete mode 100644 .idea/.gitignore delete mode 100644 .idea/compiler.xml delete mode 100644 .idea/encodings.xml delete mode 100644 .idea/jarRepositories.xml delete mode 100644 .idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_3.xml delete mode 100644 .idea/libraries/Maven__ch_qos_logback_logback_core_1_2_3.xml delete mode 100644 .idea/libraries/Maven__com_alibaba_druid_1_1_10.xml delete mode 100644 .idea/libraries/Maven__com_alibaba_fastjson_1_2_4.xml delete mode 100644 .idea/libraries/Maven__com_fasterxml_classmate_1_5_1.xml delete mode 100644 .idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_10_4.xml delete mode 100644 .idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_10_4.xml delete mode 100644 .idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_10_4.xml delete mode 100644 .idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_10_4.xml delete mode 100644 .idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_10_4.xml delete mode 100644 .idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_10_4.xml delete mode 100644 .idea/libraries/Maven__com_github_jsqlparser_jsqlparser_1_0.xml delete mode 100644 .idea/libraries/Maven__com_github_pagehelper_pagehelper_5_1_4.xml delete mode 100644 .idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_autoconfigure_1_2_5.xml delete mode 100644 .idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_starter_1_2_5.xml delete mode 100644 .idea/libraries/Maven__com_github_virtuald_curvesapi_1_06.xml delete mode 100644 .idea/libraries/Maven__com_google_code_gson_gson_2_8_0.xml delete mode 100644 .idea/libraries/Maven__com_google_guava_guava_20_0.xml delete mode 100644 .idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml delete mode 100644 .idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml delete mode 100644 .idea/libraries/Maven__com_zaxxer_HikariCP_3_4_3.xml delete mode 100644 .idea/libraries/Maven__com_zaxxer_SparseBitSet_1_2.xml delete mode 100644 .idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_4.xml delete mode 100644 .idea/libraries/Maven__commons_codec_commons_codec_1_13.xml delete mode 100644 .idea/libraries/Maven__commons_collections_commons_collections_3_2_2.xml delete mode 100644 .idea/libraries/Maven__commons_fileupload_commons_fileupload_1_4.xml delete mode 100644 .idea/libraries/Maven__commons_io_commons_io_2_6.xml delete mode 100644 .idea/libraries/Maven__commons_logging_commons_logging_1_2.xml delete mode 100644 .idea/libraries/Maven__io_jsonwebtoken_jjwt_0_6_0.xml delete mode 100644 .idea/libraries/Maven__io_springfox_springfox_core_2_8_0.xml delete mode 100644 .idea/libraries/Maven__io_springfox_springfox_schema_2_8_0.xml delete mode 100644 .idea/libraries/Maven__io_springfox_springfox_spi_2_8_0.xml delete mode 100644 .idea/libraries/Maven__io_springfox_springfox_spring_web_2_8_0.xml delete mode 100644 .idea/libraries/Maven__io_springfox_springfox_swagger2_2_8_0.xml delete mode 100644 .idea/libraries/Maven__io_springfox_springfox_swagger_common_2_8_0.xml delete mode 100644 .idea/libraries/Maven__io_springfox_springfox_swagger_ui_2_8_0.xml delete mode 100644 .idea/libraries/Maven__io_swagger_swagger_annotations_1_5_14.xml delete mode 100644 .idea/libraries/Maven__io_swagger_swagger_models_1_5_14.xml delete mode 100644 .idea/libraries/Maven__jakarta_activation_jakarta_activation_api_1_2_2.xml delete mode 100644 .idea/libraries/Maven__jakarta_annotation_jakarta_annotation_api_1_3_5.xml delete mode 100644 .idea/libraries/Maven__jakarta_validation_jakarta_validation_api_2_0_2.xml delete mode 100644 .idea/libraries/Maven__jakarta_xml_bind_jakarta_xml_bind_api_2_3_3.xml delete mode 100644 .idea/libraries/Maven__log4j_log4j_1_2_17.xml delete mode 100644 .idea/libraries/Maven__mysql_mysql_connector_java_5_1_6.xml delete mode 100644 .idea/libraries/Maven__net_bytebuddy_byte_buddy_1_10_10.xml delete mode 100644 .idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_10_10.xml delete mode 100644 .idea/libraries/Maven__net_minidev_accessors_smart_1_2.xml delete mode 100644 .idea/libraries/Maven__net_minidev_json_smart_2_3.xml delete mode 100644 .idea/libraries/Maven__org_apache_commons_commons_collections4_4_4.xml delete mode 100644 .idea/libraries/Maven__org_apache_commons_commons_compress_1_19.xml delete mode 100644 .idea/libraries/Maven__org_apache_commons_commons_lang3_3_9.xml delete mode 100644 .idea/libraries/Maven__org_apache_commons_commons_math3_3_6_1.xml delete mode 100644 .idea/libraries/Maven__org_apache_commons_commons_pool2_2_7_0.xml delete mode 100644 .idea/libraries/Maven__org_apache_commons_commons_text_1_8.xml delete mode 100644 .idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_10.xml delete mode 100644 .idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_13.xml delete mode 100644 .idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_12_1.xml delete mode 100644 .idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_12_1.xml delete mode 100644 .idea/libraries/Maven__org_apache_poi_poi_4_1_2.xml delete mode 100644 .idea/libraries/Maven__org_apache_poi_poi_ooxml_4_1_2.xml delete mode 100644 .idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_4_1_2.xml delete mode 100644 .idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_34.xml delete mode 100644 .idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_9_0_34.xml delete mode 100644 .idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_34.xml delete mode 100644 .idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_3_1_0.xml delete mode 100644 .idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_0.xml delete mode 100644 .idea/libraries/Maven__org_aspectj_aspectjweaver_1_9_5.xml delete mode 100644 .idea/libraries/Maven__org_assertj_assertj_core_3_13_2.xml delete mode 100644 .idea/libraries/Maven__org_hamcrest_hamcrest_2_1.xml delete mode 100644 .idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_0_19_Final.xml delete mode 100644 .idea/libraries/Maven__org_javassist_javassist_3_21_0_GA.xml delete mode 100644 .idea/libraries/Maven__org_jboss_logging_jboss_logging_3_4_1_Final.xml delete mode 100644 .idea/libraries/Maven__org_json_json_20090211.xml delete mode 100644 .idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_5_2.xml delete mode 100644 .idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_5_2.xml delete mode 100644 .idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_5_2.xml delete mode 100644 .idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_5_2.xml delete mode 100644 .idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_5_2.xml delete mode 100644 .idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_5_2.xml delete mode 100644 .idea/libraries/Maven__org_mapstruct_mapstruct_1_2_0_Final.xml delete mode 100644 .idea/libraries/Maven__org_mockito_mockito_core_3_1_0.xml delete mode 100644 .idea/libraries/Maven__org_mockito_mockito_junit_jupiter_3_1_0.xml delete mode 100644 .idea/libraries/Maven__org_mybatis_mybatis_3_5_4.xml delete mode 100644 .idea/libraries/Maven__org_mybatis_mybatis_spring_2_0_4.xml delete mode 100644 .idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_2_1_2.xml delete mode 100644 .idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_2_1_2.xml delete mode 100644 .idea/libraries/Maven__org_objenesis_objenesis_2_6.xml delete mode 100644 .idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml delete mode 100644 .idea/libraries/Maven__org_ow2_asm_asm_5_0_3.xml delete mode 100644 .idea/libraries/Maven__org_ow2_asm_asm_analysis_5_0_3.xml delete mode 100644 .idea/libraries/Maven__org_ow2_asm_asm_tree_5_0_3.xml delete mode 100644 .idea/libraries/Maven__org_ow2_asm_asm_util_5_0_3.xml delete mode 100644 .idea/libraries/Maven__org_parboiled_parboiled_core_1_1_7.xml delete mode 100644 .idea/libraries/Maven__org_parboiled_parboiled_java_1_1_7.xml delete mode 100644 .idea/libraries/Maven__org_pegdown_pegdown_1_6_0.xml delete mode 100644 .idea/libraries/Maven__org_projectlombok_lombok_1_18_12.xml delete mode 100644 .idea/libraries/Maven__org_reflections_reflections_0_9_11.xml delete mode 100644 .idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml delete mode 100644 .idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_30.xml delete mode 100644 .idea/libraries/Maven__org_slf4j_slf4j_api_1_7_30.xml delete mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_2_2_7_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_2_7_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_devtools_2_2_7_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_2_7_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_2_7_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_2_7_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_2_7_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_2_7_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_2_7_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_2_7_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_validation_2_2_7_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_2_7_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_2_7_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_2_7_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_1_2_0_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_plugin_spring_plugin_metadata_1_2_0_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_spring_aop_5_2_6_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_spring_beans_5_2_6_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_spring_context_5_2_6_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_spring_core_5_2_6_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_spring_expression_5_2_6_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_spring_jcl_5_2_6_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_spring_jdbc_5_2_6_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_spring_test_5_2_6_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_spring_tx_5_2_6_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_spring_web_5_2_6_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_spring_webmvc_5_2_6_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_xmlunit_xmlunit_core_2_6_4.xml delete mode 100644 .idea/libraries/Maven__org_yaml_snakeyaml_1_25.xml delete mode 100644 .idea/libraries/Maven__redis_clients_jedis_2_9_0.xml delete mode 100644 .idea/misc.xml delete mode 100644 .idea/modules.xml delete mode 100644 .idea/vcs.xml diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index 73f69e0..0000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml -# Datasource local storage ignored files -/dataSources/ -/dataSources.local.xml -# Editor-based HTTP Client requests -/httpRequests/ diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index f3de3d2..0000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml deleted file mode 100644 index 63e9001..0000000 --- a/.idea/encodings.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml deleted file mode 100644 index 2a89eda..0000000 --- a/.idea/jarRepositories.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_3.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_3.xml deleted file mode 100644 index e7f7cdb..0000000 --- a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_3.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_3.xml deleted file mode 100644 index 2dc8187..0000000 --- a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_alibaba_druid_1_1_10.xml b/.idea/libraries/Maven__com_alibaba_druid_1_1_10.xml deleted file mode 100644 index 00aa400..0000000 --- a/.idea/libraries/Maven__com_alibaba_druid_1_1_10.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_alibaba_fastjson_1_2_4.xml b/.idea/libraries/Maven__com_alibaba_fastjson_1_2_4.xml deleted file mode 100644 index 976a7e4..0000000 --- a/.idea/libraries/Maven__com_alibaba_fastjson_1_2_4.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_5_1.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_5_1.xml deleted file mode 100644 index 279e29c..0000000 --- a/.idea/libraries/Maven__com_fasterxml_classmate_1_5_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_10_4.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_10_4.xml deleted file mode 100644 index 99a7e34..0000000 --- a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_10_4.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_10_4.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_10_4.xml deleted file mode 100644 index 73a378a..0000000 --- a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_10_4.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_10_4.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_10_4.xml deleted file mode 100644 index 823fdf9..0000000 --- a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_10_4.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_10_4.xml b/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_10_4.xml deleted file mode 100644 index 0bd42a8..0000000 --- a/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_10_4.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_10_4.xml b/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_10_4.xml deleted file mode 100644 index e9dcd04..0000000 --- a/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_10_4.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_10_4.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_10_4.xml deleted file mode 100644 index 64025d8..0000000 --- a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_10_4.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_1_0.xml b/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_1_0.xml deleted file mode 100644 index 93279d3..0000000 --- a/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_1_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_pagehelper_pagehelper_5_1_4.xml b/.idea/libraries/Maven__com_github_pagehelper_pagehelper_5_1_4.xml deleted file mode 100644 index 9452c7c..0000000 --- a/.idea/libraries/Maven__com_github_pagehelper_pagehelper_5_1_4.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_autoconfigure_1_2_5.xml b/.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_autoconfigure_1_2_5.xml deleted file mode 100644 index 4c986a9..0000000 --- a/.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_autoconfigure_1_2_5.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_starter_1_2_5.xml b/.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_starter_1_2_5.xml deleted file mode 100644 index 79bb915..0000000 --- a/.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_starter_1_2_5.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_virtuald_curvesapi_1_06.xml b/.idea/libraries/Maven__com_github_virtuald_curvesapi_1_06.xml deleted file mode 100644 index cbbf5a6..0000000 --- a/.idea/libraries/Maven__com_github_virtuald_curvesapi_1_06.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_8_0.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_8_0.xml deleted file mode 100644 index 786d95e..0000000 --- a/.idea/libraries/Maven__com_google_code_gson_gson_2_8_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_guava_guava_20_0.xml b/.idea/libraries/Maven__com_google_guava_guava_20_0.xml deleted file mode 100644 index 21f7d8d..0000000 --- a/.idea/libraries/Maven__com_google_guava_guava_20_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml b/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml deleted file mode 100644 index 8b6f141..0000000 --- a/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml b/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml deleted file mode 100644 index bc0cf6b..0000000 --- a/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_zaxxer_HikariCP_3_4_3.xml b/.idea/libraries/Maven__com_zaxxer_HikariCP_3_4_3.xml deleted file mode 100644 index 1d55869..0000000 --- a/.idea/libraries/Maven__com_zaxxer_HikariCP_3_4_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_zaxxer_SparseBitSet_1_2.xml b/.idea/libraries/Maven__com_zaxxer_SparseBitSet_1_2.xml deleted file mode 100644 index 9a6c67a..0000000 --- a/.idea/libraries/Maven__com_zaxxer_SparseBitSet_1_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_4.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_4.xml deleted file mode 100644 index b04ff81..0000000 --- a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_4.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_13.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_13.xml deleted file mode 100644 index 2f79eaa..0000000 --- a/.idea/libraries/Maven__commons_codec_commons_codec_1_13.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_2.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_2.xml deleted file mode 100644 index 03183ab..0000000 --- a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_4.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_4.xml deleted file mode 100644 index 09563aa..0000000 --- a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_4.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_6.xml b/.idea/libraries/Maven__commons_io_commons_io_2_6.xml deleted file mode 100644 index 1fe379f..0000000 --- a/.idea/libraries/Maven__commons_io_commons_io_2_6.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml b/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml deleted file mode 100644 index f9233db..0000000 --- a/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_jsonwebtoken_jjwt_0_6_0.xml b/.idea/libraries/Maven__io_jsonwebtoken_jjwt_0_6_0.xml deleted file mode 100644 index 58698da..0000000 --- a/.idea/libraries/Maven__io_jsonwebtoken_jjwt_0_6_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_springfox_springfox_core_2_8_0.xml b/.idea/libraries/Maven__io_springfox_springfox_core_2_8_0.xml deleted file mode 100644 index 261ef28..0000000 --- a/.idea/libraries/Maven__io_springfox_springfox_core_2_8_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_springfox_springfox_schema_2_8_0.xml b/.idea/libraries/Maven__io_springfox_springfox_schema_2_8_0.xml deleted file mode 100644 index a44ce40..0000000 --- a/.idea/libraries/Maven__io_springfox_springfox_schema_2_8_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_springfox_springfox_spi_2_8_0.xml b/.idea/libraries/Maven__io_springfox_springfox_spi_2_8_0.xml deleted file mode 100644 index ae5bc1c..0000000 --- a/.idea/libraries/Maven__io_springfox_springfox_spi_2_8_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_springfox_springfox_spring_web_2_8_0.xml b/.idea/libraries/Maven__io_springfox_springfox_spring_web_2_8_0.xml deleted file mode 100644 index d535e9e..0000000 --- a/.idea/libraries/Maven__io_springfox_springfox_spring_web_2_8_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_springfox_springfox_swagger2_2_8_0.xml b/.idea/libraries/Maven__io_springfox_springfox_swagger2_2_8_0.xml deleted file mode 100644 index a016fed..0000000 --- a/.idea/libraries/Maven__io_springfox_springfox_swagger2_2_8_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_springfox_springfox_swagger_common_2_8_0.xml b/.idea/libraries/Maven__io_springfox_springfox_swagger_common_2_8_0.xml deleted file mode 100644 index fdcd23b..0000000 --- a/.idea/libraries/Maven__io_springfox_springfox_swagger_common_2_8_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_springfox_springfox_swagger_ui_2_8_0.xml b/.idea/libraries/Maven__io_springfox_springfox_swagger_ui_2_8_0.xml deleted file mode 100644 index dd99c6a..0000000 --- a/.idea/libraries/Maven__io_springfox_springfox_swagger_ui_2_8_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_swagger_swagger_annotations_1_5_14.xml b/.idea/libraries/Maven__io_swagger_swagger_annotations_1_5_14.xml deleted file mode 100644 index 2a2ee7a..0000000 --- a/.idea/libraries/Maven__io_swagger_swagger_annotations_1_5_14.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_swagger_swagger_models_1_5_14.xml b/.idea/libraries/Maven__io_swagger_swagger_models_1_5_14.xml deleted file mode 100644 index c390d2a..0000000 --- a/.idea/libraries/Maven__io_swagger_swagger_models_1_5_14.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__jakarta_activation_jakarta_activation_api_1_2_2.xml b/.idea/libraries/Maven__jakarta_activation_jakarta_activation_api_1_2_2.xml deleted file mode 100644 index d5c2a22..0000000 --- a/.idea/libraries/Maven__jakarta_activation_jakarta_activation_api_1_2_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__jakarta_annotation_jakarta_annotation_api_1_3_5.xml b/.idea/libraries/Maven__jakarta_annotation_jakarta_annotation_api_1_3_5.xml deleted file mode 100644 index 8647e3c..0000000 --- a/.idea/libraries/Maven__jakarta_annotation_jakarta_annotation_api_1_3_5.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__jakarta_validation_jakarta_validation_api_2_0_2.xml b/.idea/libraries/Maven__jakarta_validation_jakarta_validation_api_2_0_2.xml deleted file mode 100644 index c0dd14d..0000000 --- a/.idea/libraries/Maven__jakarta_validation_jakarta_validation_api_2_0_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__jakarta_xml_bind_jakarta_xml_bind_api_2_3_3.xml b/.idea/libraries/Maven__jakarta_xml_bind_jakarta_xml_bind_api_2_3_3.xml deleted file mode 100644 index 77e770b..0000000 --- a/.idea/libraries/Maven__jakarta_xml_bind_jakarta_xml_bind_api_2_3_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__log4j_log4j_1_2_17.xml b/.idea/libraries/Maven__log4j_log4j_1_2_17.xml deleted file mode 100644 index 82d44bb..0000000 --- a/.idea/libraries/Maven__log4j_log4j_1_2_17.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_6.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_6.xml deleted file mode 100644 index 93e3744..0000000 --- a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_6.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_10_10.xml b/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_10_10.xml deleted file mode 100644 index 03cfbfd..0000000 --- a/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_10_10.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_10_10.xml b/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_10_10.xml deleted file mode 100644 index 3fdf2a2..0000000 --- a/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_10_10.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__net_minidev_accessors_smart_1_2.xml b/.idea/libraries/Maven__net_minidev_accessors_smart_1_2.xml deleted file mode 100644 index 231778b..0000000 --- a/.idea/libraries/Maven__net_minidev_accessors_smart_1_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__net_minidev_json_smart_2_3.xml b/.idea/libraries/Maven__net_minidev_json_smart_2_3.xml deleted file mode 100644 index b3bc029..0000000 --- a/.idea/libraries/Maven__net_minidev_json_smart_2_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_collections4_4_4.xml b/.idea/libraries/Maven__org_apache_commons_commons_collections4_4_4.xml deleted file mode 100644 index 8ee19de..0000000 --- a/.idea/libraries/Maven__org_apache_commons_commons_collections4_4_4.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_compress_1_19.xml b/.idea/libraries/Maven__org_apache_commons_commons_compress_1_19.xml deleted file mode 100644 index aa4f9dd..0000000 --- a/.idea/libraries/Maven__org_apache_commons_commons_compress_1_19.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_9.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_9.xml deleted file mode 100644 index dc1b2c8..0000000 --- a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_9.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_math3_3_6_1.xml b/.idea/libraries/Maven__org_apache_commons_commons_math3_3_6_1.xml deleted file mode 100644 index 9c2404f..0000000 --- a/.idea/libraries/Maven__org_apache_commons_commons_math3_3_6_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_pool2_2_7_0.xml b/.idea/libraries/Maven__org_apache_commons_commons_pool2_2_7_0.xml deleted file mode 100644 index 6067bd2..0000000 --- a/.idea/libraries/Maven__org_apache_commons_commons_pool2_2_7_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_text_1_8.xml b/.idea/libraries/Maven__org_apache_commons_commons_text_1_8.xml deleted file mode 100644 index 0b61fa7..0000000 --- a/.idea/libraries/Maven__org_apache_commons_commons_text_1_8.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_10.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_10.xml deleted file mode 100644 index 020201a..0000000 --- a/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_10.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_13.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_13.xml deleted file mode 100644 index 5ecac7a..0000000 --- a/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_13.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_12_1.xml b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_12_1.xml deleted file mode 100644 index 18c550a..0000000 --- a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_12_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_12_1.xml b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_12_1.xml deleted file mode 100644 index 1bc9b4a..0000000 --- a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_12_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_4_1_2.xml b/.idea/libraries/Maven__org_apache_poi_poi_4_1_2.xml deleted file mode 100644 index 64fc678..0000000 --- a/.idea/libraries/Maven__org_apache_poi_poi_4_1_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_ooxml_4_1_2.xml b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_4_1_2.xml deleted file mode 100644 index 5e722e0..0000000 --- a/.idea/libraries/Maven__org_apache_poi_poi_ooxml_4_1_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_4_1_2.xml b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_4_1_2.xml deleted file mode 100644 index 29b6c77..0000000 --- a/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_4_1_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_34.xml b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_34.xml deleted file mode 100644 index 6d1572e..0000000 --- a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_34.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_9_0_34.xml b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_9_0_34.xml deleted file mode 100644 index 733274b..0000000 --- a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_9_0_34.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_34.xml b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_34.xml deleted file mode 100644 index 5af0c7e..0000000 --- a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_34.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_3_1_0.xml b/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_3_1_0.xml deleted file mode 100644 index cca64fb..0000000 --- a/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_3_1_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_0.xml b/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_0.xml deleted file mode 100644 index 1b7116d..0000000 --- a/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_9_5.xml b/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_9_5.xml deleted file mode 100644 index 35ad5ed..0000000 --- a/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_9_5.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_assertj_assertj_core_3_13_2.xml b/.idea/libraries/Maven__org_assertj_assertj_core_3_13_2.xml deleted file mode 100644 index 9baaa75..0000000 --- a/.idea/libraries/Maven__org_assertj_assertj_core_3_13_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_2_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_2_1.xml deleted file mode 100644 index 6ba461c..0000000 --- a/.idea/libraries/Maven__org_hamcrest_hamcrest_2_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_0_19_Final.xml b/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_0_19_Final.xml deleted file mode 100644 index f327eec..0000000 --- a/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_0_19_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_21_0_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_21_0_GA.xml deleted file mode 100644 index b0a8c19..0000000 --- a/.idea/libraries/Maven__org_javassist_javassist_3_21_0_GA.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_4_1_Final.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_4_1_Final.xml deleted file mode 100644 index 83f987b..0000000 --- a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_4_1_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_json_json_20090211.xml b/.idea/libraries/Maven__org_json_json_20090211.xml deleted file mode 100644 index 040ec22..0000000 --- a/.idea/libraries/Maven__org_json_json_20090211.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_5_2.xml b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_5_2.xml deleted file mode 100644 index 3ca87a7..0000000 --- a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_5_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_5_2.xml b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_5_2.xml deleted file mode 100644 index 6cd967d..0000000 --- a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_5_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_5_2.xml b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_5_2.xml deleted file mode 100644 index 91ff46d..0000000 --- a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_5_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_5_2.xml b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_5_2.xml deleted file mode 100644 index f7a6a00..0000000 --- a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_5_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_5_2.xml b/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_5_2.xml deleted file mode 100644 index 62e2574..0000000 --- a/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_5_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_5_2.xml b/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_5_2.xml deleted file mode 100644 index 8e0bb80..0000000 --- a/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_5_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mapstruct_mapstruct_1_2_0_Final.xml b/.idea/libraries/Maven__org_mapstruct_mapstruct_1_2_0_Final.xml deleted file mode 100644 index 28ef172..0000000 --- a/.idea/libraries/Maven__org_mapstruct_mapstruct_1_2_0_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_3_1_0.xml b/.idea/libraries/Maven__org_mockito_mockito_core_3_1_0.xml deleted file mode 100644 index e732d51..0000000 --- a/.idea/libraries/Maven__org_mockito_mockito_core_3_1_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_junit_jupiter_3_1_0.xml b/.idea/libraries/Maven__org_mockito_mockito_junit_jupiter_3_1_0.xml deleted file mode 100644 index 33016fa..0000000 --- a/.idea/libraries/Maven__org_mockito_mockito_junit_jupiter_3_1_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mybatis_mybatis_3_5_4.xml b/.idea/libraries/Maven__org_mybatis_mybatis_3_5_4.xml deleted file mode 100644 index 096bd46..0000000 --- a/.idea/libraries/Maven__org_mybatis_mybatis_3_5_4.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mybatis_mybatis_spring_2_0_4.xml b/.idea/libraries/Maven__org_mybatis_mybatis_spring_2_0_4.xml deleted file mode 100644 index 9b1f323..0000000 --- a/.idea/libraries/Maven__org_mybatis_mybatis_spring_2_0_4.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_2_1_2.xml b/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_2_1_2.xml deleted file mode 100644 index 54daee1..0000000 --- a/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_2_1_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_2_1_2.xml b/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_2_1_2.xml deleted file mode 100644 index a3893d1..0000000 --- a/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_2_1_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_2_6.xml b/.idea/libraries/Maven__org_objenesis_objenesis_2_6.xml deleted file mode 100644 index 3959933..0000000 --- a/.idea/libraries/Maven__org_objenesis_objenesis_2_6.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml b/.idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml deleted file mode 100644 index a1ccbab..0000000 --- a/.idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_ow2_asm_asm_5_0_3.xml b/.idea/libraries/Maven__org_ow2_asm_asm_5_0_3.xml deleted file mode 100644 index ad3f076..0000000 --- a/.idea/libraries/Maven__org_ow2_asm_asm_5_0_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_ow2_asm_asm_analysis_5_0_3.xml b/.idea/libraries/Maven__org_ow2_asm_asm_analysis_5_0_3.xml deleted file mode 100644 index 45a69ac..0000000 --- a/.idea/libraries/Maven__org_ow2_asm_asm_analysis_5_0_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_ow2_asm_asm_tree_5_0_3.xml b/.idea/libraries/Maven__org_ow2_asm_asm_tree_5_0_3.xml deleted file mode 100644 index 7823a16..0000000 --- a/.idea/libraries/Maven__org_ow2_asm_asm_tree_5_0_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_ow2_asm_asm_util_5_0_3.xml b/.idea/libraries/Maven__org_ow2_asm_asm_util_5_0_3.xml deleted file mode 100644 index 345f310..0000000 --- a/.idea/libraries/Maven__org_ow2_asm_asm_util_5_0_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_parboiled_parboiled_core_1_1_7.xml b/.idea/libraries/Maven__org_parboiled_parboiled_core_1_1_7.xml deleted file mode 100644 index 4b5feae..0000000 --- a/.idea/libraries/Maven__org_parboiled_parboiled_core_1_1_7.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_parboiled_parboiled_java_1_1_7.xml b/.idea/libraries/Maven__org_parboiled_parboiled_java_1_1_7.xml deleted file mode 100644 index 0174167..0000000 --- a/.idea/libraries/Maven__org_parboiled_parboiled_java_1_1_7.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_pegdown_pegdown_1_6_0.xml b/.idea/libraries/Maven__org_pegdown_pegdown_1_6_0.xml deleted file mode 100644 index d07e6ac..0000000 --- a/.idea/libraries/Maven__org_pegdown_pegdown_1_6_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_projectlombok_lombok_1_18_12.xml b/.idea/libraries/Maven__org_projectlombok_lombok_1_18_12.xml deleted file mode 100644 index 45ba5b6..0000000 --- a/.idea/libraries/Maven__org_projectlombok_lombok_1_18_12.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_reflections_reflections_0_9_11.xml b/.idea/libraries/Maven__org_reflections_reflections_0_9_11.xml deleted file mode 100644 index 54a7021..0000000 --- a/.idea/libraries/Maven__org_reflections_reflections_0_9_11.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml b/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml deleted file mode 100644 index 7dfcafd..0000000 --- a/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_30.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_30.xml deleted file mode 100644 index a8f376d..0000000 --- a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_30.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_30.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_30.xml deleted file mode 100644 index f6f68ca..0000000 --- a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_30.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_2_7_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_2_7_RELEASE.xml deleted file mode 100644 index 06c95cf..0000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_2_7_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_2_7_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_2_7_RELEASE.xml deleted file mode 100644 index dcab955..0000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_2_7_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_devtools_2_2_7_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_devtools_2_2_7_RELEASE.xml deleted file mode 100644 index 124550e..0000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_devtools_2_2_7_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_2_7_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_2_7_RELEASE.xml deleted file mode 100644 index 305490c..0000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_2_7_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_2_7_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_2_7_RELEASE.xml deleted file mode 100644 index e58136d..0000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_2_7_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_2_7_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_2_7_RELEASE.xml deleted file mode 100644 index 412c2ea..0000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_2_7_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_2_7_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_2_7_RELEASE.xml deleted file mode 100644 index 8c06de3..0000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_2_7_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_2_7_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_2_7_RELEASE.xml deleted file mode 100644 index af7320f..0000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_2_7_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_2_7_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_2_7_RELEASE.xml deleted file mode 100644 index e8f9023..0000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_2_7_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_2_7_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_2_7_RELEASE.xml deleted file mode 100644 index 9d0816c..0000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_2_7_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_validation_2_2_7_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_validation_2_2_7_RELEASE.xml deleted file mode 100644 index 332c1c5..0000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_validation_2_2_7_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_2_7_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_2_7_RELEASE.xml deleted file mode 100644 index 2ec0ca5..0000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_2_7_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_2_7_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_2_7_RELEASE.xml deleted file mode 100644 index bba679a..0000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_2_7_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_2_7_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_2_7_RELEASE.xml deleted file mode 100644 index 041f867..0000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_2_7_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_1_2_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_1_2_0_RELEASE.xml deleted file mode 100644 index f9f22fd..0000000 --- a/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_1_2_0_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_metadata_1_2_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_metadata_1_2_0_RELEASE.xml deleted file mode 100644 index 4f9be1e..0000000 --- a/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_metadata_1_2_0_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_5_2_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_5_2_6_RELEASE.xml deleted file mode 100644 index 835cecb..0000000 --- a/.idea/libraries/Maven__org_springframework_spring_aop_5_2_6_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_5_2_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_5_2_6_RELEASE.xml deleted file mode 100644 index 623c12a..0000000 --- a/.idea/libraries/Maven__org_springframework_spring_beans_5_2_6_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_5_2_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_5_2_6_RELEASE.xml deleted file mode 100644 index 46d500a..0000000 --- a/.idea/libraries/Maven__org_springframework_spring_context_5_2_6_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_core_5_2_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_core_5_2_6_RELEASE.xml deleted file mode 100644 index ae89681..0000000 --- a/.idea/libraries/Maven__org_springframework_spring_core_5_2_6_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_5_2_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_expression_5_2_6_RELEASE.xml deleted file mode 100644 index 3d90d1f..0000000 --- a/.idea/libraries/Maven__org_springframework_spring_expression_5_2_6_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jcl_5_2_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jcl_5_2_6_RELEASE.xml deleted file mode 100644 index 69325bb..0000000 --- a/.idea/libraries/Maven__org_springframework_spring_jcl_5_2_6_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_5_2_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_5_2_6_RELEASE.xml deleted file mode 100644 index 0903244..0000000 --- a/.idea/libraries/Maven__org_springframework_spring_jdbc_5_2_6_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_test_5_2_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_test_5_2_6_RELEASE.xml deleted file mode 100644 index 3c52bdf..0000000 --- a/.idea/libraries/Maven__org_springframework_spring_test_5_2_6_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_5_2_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_tx_5_2_6_RELEASE.xml deleted file mode 100644 index a07dd40..0000000 --- a/.idea/libraries/Maven__org_springframework_spring_tx_5_2_6_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_web_5_2_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_web_5_2_6_RELEASE.xml deleted file mode 100644 index 9758169..0000000 --- a/.idea/libraries/Maven__org_springframework_spring_web_5_2_6_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_webmvc_5_2_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_webmvc_5_2_6_RELEASE.xml deleted file mode 100644 index 79b56be..0000000 --- a/.idea/libraries/Maven__org_springframework_spring_webmvc_5_2_6_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_6_4.xml b/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_6_4.xml deleted file mode 100644 index 54ddd87..0000000 --- a/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_6_4.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_yaml_snakeyaml_1_25.xml b/.idea/libraries/Maven__org_yaml_snakeyaml_1_25.xml deleted file mode 100644 index edb6d93..0000000 --- a/.idea/libraries/Maven__org_yaml_snakeyaml_1_25.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__redis_clients_jedis_2_9_0.xml b/.idea/libraries/Maven__redis_clients_jedis_2_9_0.xml deleted file mode 100644 index a51c1da..0000000 --- a/.idea/libraries/Maven__redis_clients_jedis_2_9_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 4361200..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index 42a633f..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 94a25f7..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file -- Gitee From 126231358b9a79dbb8b723e463e75da2d7335fa2 Mon Sep 17 00:00:00 2001 From: ljc Date: Mon, 2 Nov 2020 15:13:13 +0800 Subject: [PATCH 148/211] =?UTF-8?q?=E5=90=88=E5=90=8C=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=EF=BC=8C=E9=83=A8=E9=97=A8=E5=90=88=E5=90=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- softline-files-manage.iml | 159 ------------------ .../soft/line/mapper/ContractInfoMapper.xml | 2 +- 2 files changed, 1 insertion(+), 160 deletions(-) delete mode 100644 softline-files-manage.iml diff --git a/softline-files-manage.iml b/softline-files-manage.iml deleted file mode 100644 index 70459be..0000000 --- a/softline-files-manage.iml +++ /dev/null @@ -1,159 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml b/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml index 594fdd9..d8471e6 100644 --- a/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml +++ b/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml @@ -209,7 +209,7 @@ @@ -153,4 +153,16 @@ del_flg != 1 GROUP BY cert_type + + \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml b/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml index d8471e6..a0baafc 100644 --- a/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml +++ b/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml @@ -121,10 +121,10 @@ AND instr(`sign_addr`,#{signAddr,jdbcType=VARCHAR})>0 - AND `begin_date` >= #{beginDate,jdbcType=TIMESTAMP} + AND `begin_date` =]]> #{beginDate,jdbcType=TIMESTAMP} - AND `end_date` >= #{endDate,jdbcType=TIMESTAMP} + AND `end_date` #{endDate,jdbcType=TIMESTAMP} AND instr(`payment`,#{payment,jdbcType=VARCHAR})>0 diff --git a/src/main/java/com/soft/line/service/StatisticsService.java b/src/main/java/com/soft/line/service/StatisticsService.java index 6452465..1bdf9da 100644 --- a/src/main/java/com/soft/line/service/StatisticsService.java +++ b/src/main/java/com/soft/line/service/StatisticsService.java @@ -18,4 +18,6 @@ public interface StatisticsService { public List> amountRankingForContract(); public List> depRankingForContract(); + + public List> certTypeRankThisYear(); } diff --git a/src/main/java/com/soft/line/service/impl/StatisticsServiceImpl.java b/src/main/java/com/soft/line/service/impl/StatisticsServiceImpl.java index 4f3cc84..ab0e9ce 100644 --- a/src/main/java/com/soft/line/service/impl/StatisticsServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/StatisticsServiceImpl.java @@ -83,5 +83,10 @@ public class StatisticsServiceImpl implements StatisticsService { return contractInfoMapper.depRanking(); } + @Override + public List> certTypeRankThisYear() { + return certificateInfoMapper.certTypeRankThisYear(); + } + } -- Gitee From a195bd190841cfed56ddff197bd97d497c1c37d5 Mon Sep 17 00:00:00 2001 From: wuxueqiao <17625808004@163.com> Date: Thu, 12 Nov 2020 09:55:04 +0800 Subject: [PATCH 152/211] =?UTF-8?q?token=20=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/soft/line/auth/AuthConstant.java | 45 +++++++++ src/main/java/com/soft/line/auth/Md5Util.java | 18 ++++ src/main/java/com/soft/line/auth/StrUtil.java | 35 +++++++ .../com/soft/line/entity/UserInfoToken.java | 1 + .../com/soft/line/mapper/UserInfoMapper.java | 2 + .../com/soft/line/mapper/UserInfoMapper.xml | 8 +- .../line/service/impl/LoginServiceImpl.java | 94 ++++++++++++------- 7 files changed, 166 insertions(+), 37 deletions(-) create mode 100644 src/main/java/com/soft/line/auth/AuthConstant.java create mode 100644 src/main/java/com/soft/line/auth/Md5Util.java create mode 100644 src/main/java/com/soft/line/auth/StrUtil.java diff --git a/src/main/java/com/soft/line/auth/AuthConstant.java b/src/main/java/com/soft/line/auth/AuthConstant.java new file mode 100644 index 0000000..3a79188 --- /dev/null +++ b/src/main/java/com/soft/line/auth/AuthConstant.java @@ -0,0 +1,45 @@ +package com.soft.line.auth; + +/** + * 权限相关常量定义 + * + * @author 86185 + * @date 2020/5/9 15:51 + */ +public class AuthConstant { + + /** + * 用户默认密码 + */ + public static final String DEFAULT_PASSWORD = "111111"; + /** + * 密码加密拼接key值 + */ + public static final String PASSWORD_ENCRYPT_KEY = "$admin_key"; + + /** + * 请求header中token参数名 + */ + public static final String TOKEN_HEADER = "Authorization"; + /** + * token中加密的md5长度 + */ + public static final int TOKEN_MD5_LENGTH = 32; + /** + * 加密token拼接字符 + */ + public static final String SAFE_STRING = "$token$"; + /** + * 用户名密码登录生成token前缀 + */ + public static final String USER_TOKEN_PREFIX = "Basic "; + /** + * 微信授权登录生成token前缀 + */ + public static final String WE_CHAT_TOKEN_PREFIX = "Bearer "; + /** + * 微信授权登录服务器第三方session有效时间，单位秒，默认24小时 + */ + public static final long WE_CHAT_EXPIRES = 86400; + +} diff --git a/src/main/java/com/soft/line/auth/Md5Util.java b/src/main/java/com/soft/line/auth/Md5Util.java new file mode 100644 index 0000000..19e0ee7 --- /dev/null +++ b/src/main/java/com/soft/line/auth/Md5Util.java @@ -0,0 +1,18 @@ +package com.soft.line.auth; + +import org.apache.commons.codec.digest.DigestUtils; + +/** + * Md5加密工具 + * + * @author 86185 + * @date 2020/5/13 10:53 + */ +public class Md5Util { + + public static String encodeMd5(final String str) { + + return DigestUtils.md5Hex(str); + } + +} diff --git a/src/main/java/com/soft/line/auth/StrUtil.java b/src/main/java/com/soft/line/auth/StrUtil.java new file mode 100644 index 0000000..683a215 --- /dev/null +++ b/src/main/java/com/soft/line/auth/StrUtil.java @@ -0,0 +1,35 @@ +package com.soft.line.auth; + +/** + * @author 86185 + * @date 2020/5/13 10:57 + */ +public class StrUtil { + + /** + * 拼接字符串 + * + * @param str 需拼接字符串 + * @param params 替换str中的{}字符参数 + * @return str + */ + public static String spliceStr(String str, Object... params) { + StringBuilder builder = new StringBuilder(str.length() + 30); + int i = 0; + int j; + for (Object param : params) { + j = str.indexOf("{}", i); + if (j != -1) { + builder.append(str, i, j); + builder.append(param); + i = j + 2; + } else { + break; + } + } + builder.append(str, i, str.length()); + + return builder.toString(); + } + +} diff --git a/src/main/java/com/soft/line/entity/UserInfoToken.java b/src/main/java/com/soft/line/entity/UserInfoToken.java index 48c0625..a9482cd 100644 --- a/src/main/java/com/soft/line/entity/UserInfoToken.java +++ b/src/main/java/com/soft/line/entity/UserInfoToken.java @@ -13,6 +13,7 @@ public class UserInfoToken { private String userName; private String phone; private int roleId; + private String roleName; private String password; diff --git a/src/main/java/com/soft/line/mapper/UserInfoMapper.java b/src/main/java/com/soft/line/mapper/UserInfoMapper.java index 95cc61c..25e46a7 100644 --- a/src/main/java/com/soft/line/mapper/UserInfoMapper.java +++ b/src/main/java/com/soft/line/mapper/UserInfoMapper.java @@ -87,4 +87,6 @@ public interface UserInfoMapper { int deleteOpenId(int id); int countByRoleId(int roleId); + + String selectRoleName(int roleId); } \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/UserInfoMapper.xml b/src/main/java/com/soft/line/mapper/UserInfoMapper.xml index 513d3ca..0fff5a7 100644 --- a/src/main/java/com/soft/line/mapper/UserInfoMapper.xml +++ b/src/main/java/com/soft/line/mapper/UserInfoMapper.xml @@ -145,5 +145,11 @@ from `user_info` WHERE `role_id` = #{roleId} - + \ No newline at end of file diff --git a/src/main/java/com/soft/line/service/impl/LoginServiceImpl.java b/src/main/java/com/soft/line/service/impl/LoginServiceImpl.java index 5099120..82ce09e 100644 --- a/src/main/java/com/soft/line/service/impl/LoginServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/LoginServiceImpl.java @@ -1,5 +1,8 @@ package com.soft.line.service.impl; +import com.soft.line.auth.AuthConstant; +import com.soft.line.auth.Md5Util; +import com.soft.line.auth.StrUtil; import com.soft.line.entity.*; import com.soft.line.filter.GsonUtil; import com.soft.line.filter.HttpRequestUtil; @@ -19,11 +22,13 @@ import io.jsonwebtoken.Jwts; import io.jsonwebtoken.SignatureAlgorithm; import io.swagger.models.auth.In; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.codec.binary.Base64; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import java.nio.charset.StandardCharsets; import java.util.*; import java.util.stream.Collectors; @@ -50,25 +55,27 @@ public class LoginServiceImpl implements LoginService { @Override public CommonResult userLogin(Map map) { - UserInfo userInfo= userInfoMapper.userLogin(map); - if(userInfo!=null){ - UserInfoToken userInfoToken=new UserInfoToken(); - userInfoToken.setUserName(userInfo.getUserName()); - userInfoToken.setRoleId(userInfo.getRoleId()); - userInfoToken.setPhone(userInfo.getPhone()); - userInfoToken.setId(userInfo.getId()); - userInfoToken.setPassword(userInfo.getPassword()); - UserTokenDto user=new UserTokenDto(); - user.setUserInfo(userInfoToken); - String token=returnToken(user); - user.setToken(token); - if (token == null || "".equals(token)) { - return CommonResult.failed("redis插入失败"); - } - return CommonResult.success(user); - }else{ - return CommonResult.failed("登录失败！"); - } + UserInfo userInfo= userInfoMapper.userLogin(map); + if(userInfo!=null){ + UserInfoToken userInfoToken=new UserInfoToken(); + userInfoToken.setUserName(userInfo.getUserName()); + userInfoToken.setRoleId(userInfo.getRoleId()); + String roleName=userInfoMapper.selectRoleName(userInfo.getRoleId()); + userInfoToken.setRoleName(roleName); + userInfoToken.setPhone(userInfo.getPhone()); + userInfoToken.setId(userInfo.getId()); + userInfoToken.setPassword(userInfo.getPassword()); + UserTokenDto user=new UserTokenDto(); + user.setUserInfo(userInfoToken); + String token=returnToken(user); + user.setToken(token); + if (token == null || "".equals(token)) { + return CommonResult.failed("redis插入失败"); + } + return CommonResult.success(user); + }else{ + return CommonResult.failed("登录失败！"); + } } @Override @@ -88,13 +95,28 @@ public class LoginServiceImpl implements LoginService { private String returnToken(final UserTokenDto user) { if (redisClient.getKeyValue(user.getUserInfo().getUserName()) == null || "".equals(redisClient.getKeyValue(user.getUserInfo().getUserName()))) { - final Map claims = new HashMap<>(); - claims.put("password", user.getUserInfo().getPassword()); - claims.put("username", user.getUserInfo().getUserName()); - claims.put("uuid", UUID.randomUUID().toString()); - final String token = Jwts.builder().setClaims(claims) - .signWith(SignatureAlgorithm.HS512, HttpRequestUtil.key).compact(); +// final Map claims = new HashMap<>(); +// claims.put("password", user.getUserInfo().getPassword()); +// claims.put("username", user.getUserInfo().getUserName()); +// claims.put("uuid", UUID.randomUUID().toString()); + //final String token = Jwts.builder().setClaims(claims) + // .signWith(SignatureAlgorithm.HS512, HttpRequestUtil.key).compact(); + + String spliceStr; + Long lifeTime=null; + if (lifeTime == null) { + spliceStr = "{}-{}-{}"; + } else { + spliceStr = "{}-{}-{}-{}"; + lifeTime = System.currentTimeMillis() + lifeTime; + } + String tokenPlainText = AuthConstant.USER_TOKEN_PREFIX + StrUtil.spliceStr(spliceStr, user.getUserInfo().getId(), + user.getUserInfo().getUserName(), user.getUserInfo().getRoleName(), lifeTime); + String base64Token = Base64.encodeBase64String(tokenPlainText.getBytes(StandardCharsets.UTF_8)); + String md5PlainText = base64Token + AuthConstant.SAFE_STRING; + String token=base64Token + Md5Util.encodeMd5(md5PlainText).toUpperCase(); user.setToken(token); + System.out.println(token); if (!redisClient.setKeyValue(user.getUserInfo().getUserName(), GsonUtil.javabeanToJson(user),HttpRequestUtil.expire)) { return null; } @@ -192,22 +214,22 @@ public class LoginServiceImpl implements LoginService { @Override @Transactional(rollbackFor=Exception.class) public AjaxResult getUserInfo(Map map) { - UserTokenDto userTokenDto= HttpRequestUtil.getUserToken(); - int id=userTokenDto.getUserInfo().getId(); - String code=map.get("code"); + UserTokenDto userTokenDto= HttpRequestUtil.getUserToken(); + int id=userTokenDto.getUserInfo().getId(); + String code=map.get("code"); //获取openId String openId=OpenIdUtil.getOpenId(code); if (openId==null) { System.out.println("获取openId失败！"); return AjaxResult.error("获取微信信息失败，请稍后再试！"); } - UserInfo userInfo = userInfoMapper.getUserInfoByOpenId(openId); - //有token又没有根据此openId查出用户 说明openId变了 此时根据用户id查询绑定用户openId - if(userInfo==null) { - userInfoMapper.updateOpenIdById(openId, id); - userInfo = userInfoMapper.getUserInfoByOpenId(openId); - return AjaxResult.success(userInfo); - } + UserInfo userInfo = userInfoMapper.getUserInfoByOpenId(openId); + //有token又没有根据此openId查出用户 说明openId变了 此时根据用户id查询绑定用户openId + if(userInfo==null) { + userInfoMapper.updateOpenIdById(openId, id); + userInfo = userInfoMapper.getUserInfoByOpenId(openId); + return AjaxResult.success(userInfo); + } return AjaxResult.success(userInfo); } @@ -231,7 +253,7 @@ public class LoginServiceImpl implements LoginService { if(result>0){ return AjaxResult.success(); } - return AjaxResult.error(); + return AjaxResult.error(); } @Override -- Gitee From d603cb30293d2c68b8b5f8762ec4266d52d3a22a Mon Sep 17 00:00:00 2001 From: wuxueqiao <17625808004@163.com> Date: Thu, 12 Nov 2020 09:57:41 +0800 Subject: [PATCH 153/211] Signed-off-by: wuxueqiao <17625808004@163.com> --- .gitignore | 1 + softline-files-manage.iml | 159 -------------------------------------- 2 files changed, 1 insertion(+), 159 deletions(-) create mode 100644 .gitignore delete mode 100644 softline-files-manage.iml diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..bfa6a22 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +# Created by .ignore support plugin (hsz.mobi) diff --git a/softline-files-manage.iml b/softline-files-manage.iml deleted file mode 100644 index 70459be..0000000 --- a/softline-files-manage.iml +++ /dev/null @@ -1,159 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file -- Gitee From 5ea31961674ed4c5704d5eb1d8e108f7fc831241 Mon Sep 17 00:00:00 2001 From: admin Date: Fri, 13 Nov 2020 11:26:24 +0800 Subject: [PATCH 154/211] =?UTF-8?q?token=E8=A7=A3=E6=9E=90=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + src/main/java/com/soft/line/filter/Token.java | 32 +++++++++++++++---- 2 files changed, 27 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index bfa6a22..62e7820 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ # Created by .ignore support plugin (hsz.mobi) +.idea \ No newline at end of file diff --git a/src/main/java/com/soft/line/filter/Token.java b/src/main/java/com/soft/line/filter/Token.java index 90ba033..1dfdc5e 100644 --- a/src/main/java/com/soft/line/filter/Token.java +++ b/src/main/java/com/soft/line/filter/Token.java @@ -1,6 +1,12 @@ package com.soft.line.filter; +import com.soft.line.auth.AuthConstant; +import com.soft.line.auth.Md5Util; +import com.soft.line.entity.UserInfo; import io.jsonwebtoken.*; +import org.apache.commons.codec.binary.Base64; +import org.apache.commons.lang3.StringUtils; + /** * @author wu.xueqiao on 2020/5/12. * @version 0.1 @@ -21,12 +27,26 @@ public class Token { public Token(final String token) { try { - JwtParser jwtParser = Jwts.parser().setSigningKey(HttpRequestUtil.key); - Jws claimsJws = jwtParser.parseClaimsJws(token); - Claims body = claimsJws.getBody(); - final Claims claims = Jwts.parser().setSigningKey(HttpRequestUtil.key).parseClaimsJws(token).getBody(); - - this.username = claims.get("username").toString(); +// if (StringUtils.isEmpty(token) || token.length() < AuthConstant.TOKEN_MD5_LENGTH) { +// return null; +// } + String base64Token = token.substring(0, token.length() - AuthConstant.TOKEN_MD5_LENGTH); +// if (!token.toUpperCase().endsWith(Md5Util.encodeMd5(base64Token + AuthConstant.SAFE_STRING).toUpperCase())) { +// return null; +// } + String tokenPlainText = new String(Base64.decodeBase64(base64Token)); + tokenPlainText = tokenPlainText.substring(AuthConstant.USER_TOKEN_PREFIX.length()); + String[] arr = tokenPlainText.split("-"); +// if (arr.length < 4 - 1) { +// return null; +// } + +// UserToken userToken = new UserToken(); + UserInfo user = new UserInfo(); + user.setId(Integer.valueOf(arr[0])); + user.setUserName(arr[1]); + + this.username = arr[1]; } catch (final ExpiredJwtException e) { this.err = ExpiredJwtError; } catch (final SignatureException e) { -- Gitee From 85eecfabdfb62fcf1041f663572797fa589677ca Mon Sep 17 00:00:00 2001 From: ljc Date: Fri, 13 Nov 2020 12:40:35 +0800 Subject: [PATCH 155/211] =?UTF-8?q?=E4=BF=AE=E6=94=B9rolemapper?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/soft/line/mapper/RoleInfoMapper.java | 2 ++ src/main/java/com/soft/line/mapper/RoleInfoMapper.xml | 8 ++++++++ src/main/java/com/soft/line/mapper/UserInfoMapper.java | 3 ++- src/main/java/com/soft/line/mapper/UserInfoMapper.xml | 8 +------- .../java/com/soft/line/service/impl/LoginServiceImpl.java | 2 +- src/main/resources/application.properties | 2 +- 6 files changed, 15 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/soft/line/mapper/RoleInfoMapper.java b/src/main/java/com/soft/line/mapper/RoleInfoMapper.java index ee4cff5..27a3813 100644 --- a/src/main/java/com/soft/line/mapper/RoleInfoMapper.java +++ b/src/main/java/com/soft/line/mapper/RoleInfoMapper.java @@ -21,4 +21,6 @@ public interface RoleInfoMapper { int countRoleName(@Param("id") Integer id,@Param("roleName") String roleName); RoleInfo selectByRoleName(String roleName); + + String selectRoleName(@Param("roleId") int roleId); } \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/RoleInfoMapper.xml b/src/main/java/com/soft/line/mapper/RoleInfoMapper.xml index 84cc1ea..ebe9746 100644 --- a/src/main/java/com/soft/line/mapper/RoleInfoMapper.xml +++ b/src/main/java/com/soft/line/mapper/RoleInfoMapper.xml @@ -51,4 +51,12 @@ select `id`, `name`,`state`,`modify_person`,`modify_time` from role_info where `name` = #{roleName} + + \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/UserInfoMapper.java b/src/main/java/com/soft/line/mapper/UserInfoMapper.java index 25e46a7..833ea93 100644 --- a/src/main/java/com/soft/line/mapper/UserInfoMapper.java +++ b/src/main/java/com/soft/line/mapper/UserInfoMapper.java @@ -1,6 +1,7 @@ package com.soft.line.mapper; import com.soft.line.entity.UserInfo; +import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; @@ -88,5 +89,5 @@ public interface UserInfoMapper { int countByRoleId(int roleId); - String selectRoleName(int roleId); + // String selectRoleName(@Param("roleId") int roleId); } \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/UserInfoMapper.xml b/src/main/java/com/soft/line/mapper/UserInfoMapper.xml index 0fff5a7..513d3ca 100644 --- a/src/main/java/com/soft/line/mapper/UserInfoMapper.xml +++ b/src/main/java/com/soft/line/mapper/UserInfoMapper.xml @@ -145,11 +145,5 @@ from `user_info` WHERE `role_id` = #{roleId} - + \ No newline at end of file diff --git a/src/main/java/com/soft/line/service/impl/LoginServiceImpl.java b/src/main/java/com/soft/line/service/impl/LoginServiceImpl.java index 82ce09e..538ba7d 100644 --- a/src/main/java/com/soft/line/service/impl/LoginServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/LoginServiceImpl.java @@ -60,7 +60,7 @@ public class LoginServiceImpl implements LoginService { UserInfoToken userInfoToken=new UserInfoToken(); userInfoToken.setUserName(userInfo.getUserName()); userInfoToken.setRoleId(userInfo.getRoleId()); - String roleName=userInfoMapper.selectRoleName(userInfo.getRoleId()); + String roleName=roleInfoMapper.selectRoleName(userInfo.getRoleId()); userInfoToken.setRoleName(roleName); userInfoToken.setPhone(userInfo.getPhone()); userInfoToken.setId(userInfo.getId()); diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 52230f2..fc06422 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -24,7 +24,7 @@ spring.datasource.druid.useGlobalDataSourceStat=true spring.datasource.druid.connectionProperties=druid.stat.mergeSql=true;druid.stat.slowSqlMillis=500 #redisӵַ -spring.jedis.host = 175.24.112.245 +spring.jedis.host = 127.0.0.1 spring.jedis.password= 123456 spring.jedis.port = 6379 spring.jedis.uri=redis://127.0.0.1:6379/11 -- Gitee From 8cc02ccfb40bee31900d2600eefe51ce09084f63 Mon Sep 17 00:00:00 2001 From: ljc Date: Fri, 13 Nov 2020 14:34:05 +0800 Subject: [PATCH 156/211] =?UTF-8?q?=E3=80=82=E3=80=82=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- target/classes/api/API.json | 131 -- target/classes/api/Api doc.md | 1294 ----------------- target/classes/application.properties | 67 - .../line/SoftlineFilesManageApplication.class | Bin 1809 -> 0 bytes .../com/soft/line/aop/Permission.class | Bin 431 -> 0 bytes .../com/soft/line/aop/PermissionAspect.class | Bin 4196 -> 0 bytes .../line/common/AppletSystemConstant.class | Bin 1231 -> 0 bytes .../line/common/GlobalExceptionHandler.class | Bin 5171 -> 0 bytes .../com/soft/line/common/WebMvcConfig.class | Bin 1855 -> 0 bytes .../AppletCertificateController.class | Bin 4145 -> 0 bytes .../controller/AppletCommonController.class | Bin 2610 -> 0 bytes .../controller/AppletContractController.class | Bin 4162 -> 0 bytes .../controller/AttachmentController.class | Bin 3465 -> 0 bytes .../CertificateInfoController.class | Bin 6227 -> 0 bytes .../controller/CodeDetailController.class | Bin 1948 -> 0 bytes .../line/controller/CommonController.class | Bin 3530 -> 0 bytes .../controller/ContractInfoController.class | Bin 5893 -> 0 bytes .../line/controller/LoginController.class | Bin 2653 -> 0 bytes .../line/controller/MenuInfoController.class | Bin 6168 -> 0 bytes .../line/controller/MpLoginController.class | Bin 2433 -> 0 bytes .../line/controller/RoleInfoController.class | Bin 3359 -> 0 bytes .../controller/StatisticsController.class | Bin 3322 -> 0 bytes .../line/controller/UserInfoController.class | Bin 4423 -> 0 bytes .../com/soft/line/druid/DruidConfig.class | Bin 713 -> 0 bytes .../com/soft/line/druid/DruidFilter.class | Bin 626 -> 0 bytes .../com/soft/line/druid/DruidServlet.class | Bin 669 -> 0 bytes .../soft/line/entity/AppletCertificate.class | Bin 8283 -> 0 bytes .../com/soft/line/entity/AppletContract.class | Bin 10500 -> 0 bytes .../com/soft/line/entity/AttachmentInfo.class | Bin 2305 -> 0 bytes .../com/soft/line/entity/ButtonInfo.class | Bin 1011 -> 0 bytes .../soft/line/entity/CertificateInfo.class | Bin 8523 -> 0 bytes .../com/soft/line/entity/CodeDetail.class | Bin 2489 -> 0 bytes .../com/soft/line/entity/ContractInfo.class | Bin 11736 -> 0 bytes .../com/soft/line/entity/MenuButtonInfo.class | Bin 1841 -> 0 bytes .../com/soft/line/entity/MenuInfo.class | Bin 7529 -> 0 bytes .../com/soft/line/entity/RoleInfo.class | Bin 4151 -> 0 bytes .../com/soft/line/entity/RoleMenu.class | Bin 1793 -> 0 bytes .../com/soft/line/entity/UserInfo.class | Bin 8115 -> 0 bytes .../com/soft/line/entity/UserInfoToken.class | Bin 3174 -> 0 bytes .../com/soft/line/entity/UserPermission.class | Bin 5054 -> 0 bytes .../com/soft/line/entity/WorkJournal.class | Bin 2800 -> 0 bytes .../filter/ConfigurationFilter$MyFilter.class | Bin 5099 -> 0 bytes .../line/filter/ConfigurationFilter.class | Bin 2104 -> 0 bytes .../GlobalApplicationContextHolder.class | Bin 1782 -> 0 bytes .../com/soft/line/filter/GsonUtil.class | Bin 1001 -> 0 bytes .../soft/line/filter/HttpRequestUtil.class | Bin 3460 -> 0 bytes .../line/filter/ResponseWrapper$Meta.class | Bin 919 -> 0 bytes .../soft/line/filter/ResponseWrapper.class | Bin 2606 -> 0 bytes .../com/soft/line/filter/StatusCode.class | Bin 2306 -> 0 bytes .../classes/com/soft/line/filter/Token.class | Bin 1972 -> 0 bytes .../com/soft/line/filter/UserTokenDto.class | Bin 2111 -> 0 bytes .../line/mapper/AppletCertificateMapper.class | Bin 1743 -> 0 bytes .../line/mapper/AppletCertificateMapper.xml | 250 ---- .../soft/line/mapper/AppletCommonMapper.class | Bin 1191 -> 0 bytes .../soft/line/mapper/AppletCommonMapper.xml | 44 - .../line/mapper/AppletContractMapper.class | Bin 1612 -> 0 bytes .../soft/line/mapper/AppletContractMapper.xml | 211 --- .../line/mapper/AttachmentInfoMapper.class | Bin 1220 -> 0 bytes .../soft/line/mapper/AttachmentInfoMapper.xml | 59 - .../soft/line/mapper/ButtonInfoMapper.class | Bin 890 -> 0 bytes .../com/soft/line/mapper/ButtonInfoMapper.xml | 44 - .../line/mapper/CertificateInfoMapper.class | Bin 1661 -> 0 bytes .../line/mapper/CertificateInfoMapper.xml | 156 -- .../soft/line/mapper/CodeDetailMapper.class | Bin 1009 -> 0 bytes .../com/soft/line/mapper/CodeDetailMapper.xml | 59 - .../soft/line/mapper/ContractInfoMapper.class | Bin 1851 -> 0 bytes .../soft/line/mapper/ContractInfoMapper.xml | 252 ---- .../line/mapper/MenuButtonInfoMapper.class | Bin 972 -> 0 bytes .../soft/line/mapper/MenuButtonInfoMapper.xml | 42 - .../com/soft/line/mapper/MenuInfoMapper.class | Bin 1512 -> 0 bytes .../com/soft/line/mapper/MenuInfoMapper.xml | 119 -- .../com/soft/line/mapper/RoleInfoMapper.class | Bin 948 -> 0 bytes .../com/soft/line/mapper/RoleInfoMapper.xml | 54 - .../com/soft/line/mapper/RoleMenuMapper.class | Bin 866 -> 0 bytes .../com/soft/line/mapper/RoleMenuMapper.xml | 37 - .../com/soft/line/mapper/UserInfoMapper.class | Bin 1394 -> 0 bytes .../com/soft/line/mapper/UserInfoMapper.xml | 149 -- .../soft/line/mapper/WorkJournalMapper.class | Bin 450 -> 0 bytes .../soft/line/mapper/WorkJournalMapper.xml | 50 - .../service/AppletCertificateService.class | Bin 878 -> 0 bytes .../line/service/AppletCommonService.class | Bin 495 -> 0 bytes .../line/service/AppletContractService.class | Bin 838 -> 0 bytes .../line/service/AttachMentInfoService.class | Bin 676 -> 0 bytes .../soft/line/service/ButtonInfoService.class | Bin 378 -> 0 bytes .../line/service/CertificateInfoService.class | Bin 1290 -> 0 bytes .../soft/line/service/CodeDetailService.class | Bin 641 -> 0 bytes .../line/service/ContractInfoService.class | Bin 1109 -> 0 bytes .../com/soft/line/service/LoginService.class | Bin 1019 -> 0 bytes .../soft/line/service/MenuInfoService.class | Bin 1230 -> 0 bytes .../soft/line/service/RoleInfoService.class | Bin 826 -> 0 bytes .../soft/line/service/StatisticsService.class | Bin 777 -> 0 bytes .../soft/line/service/UserInfoService.class | Bin 812 -> 0 bytes .../impl/AppletCertificateServiceImpl.class | Bin 9590 -> 0 bytes .../impl/AppletCommonServiceImpl.class | Bin 5850 -> 0 bytes .../impl/AppletContractServiceImpl.class | Bin 10591 -> 0 bytes .../impl/AttachmentInfoServiceImpl.class | Bin 6150 -> 0 bytes .../service/impl/ButtonInfoServiceImpl.class | Bin 1268 -> 0 bytes .../impl/CertificateInfoServiceImpl.class | Bin 5224 -> 0 bytes .../service/impl/CodeDetailServiceImpl.class | Bin 1733 -> 0 bytes .../impl/ContractInfoServiceImpl.class | Bin 4905 -> 0 bytes .../line/service/impl/LoginServiceImpl.class | Bin 12041 -> 0 bytes .../service/impl/MenuInfoServiceImpl.class | Bin 6983 -> 0 bytes .../service/impl/RoleInfoServiceImpl.class | Bin 5893 -> 0 bytes .../service/impl/StatisticsServiceImpl.class | Bin 3771 -> 0 bytes .../service/impl/UserInfoServiceImpl.class | Bin 4026 -> 0 bytes .../soft/line/util/MP/AjaxResult$Type.class | Bin 1594 -> 0 bytes .../com/soft/line/util/MP/AjaxResult.class | Bin 3341 -> 0 bytes .../com/soft/line/util/MP/DateUtil.class | Bin 2024 -> 0 bytes .../soft/line/util/MP/HttpClientUtil.class | Bin 5693 -> 0 bytes .../com/soft/line/util/MP/OpenIdUtil.class | Bin 1262 -> 0 bytes .../soft/line/util/MP/SystemConstant.class | Bin 780 -> 0 bytes .../com/soft/line/util/WebToolUtils.class | Bin 2628 -> 0 bytes .../line/util/config/Swagger2Config.class | Bin 2475 -> 0 bytes .../soft/line/util/exception/Asserts.class | Bin 710 -> 0 bytes .../line/util/exception/CommonResult.class | Bin 5806 -> 0 bytes .../line/util/exception/GlobalException.class | Bin 1180 -> 0 bytes .../soft/line/util/exception/IErrorCode.class | Bin 216 -> 0 bytes .../soft/line/util/exception/ResultCode.class | Bin 2042 -> 0 bytes .../soft/line/util/exception/ResultData.class | Bin 1347 -> 0 bytes .../line/util/generator/mybatis-generator.xml | 95 -- .../jackson/converter/ConverterConfig.class | Bin 1391 -> 0 bytes .../converter/StringToDateConverter.class | Bin 946 -> 0 bytes .../jackson/converter/StringToDateUtil.class | Bin 2157 -> 0 bytes .../converter/StringToDoubleConverter.class | Bin 958 -> 0 bytes .../converter/StringToDoubleUtil.class | Bin 817 -> 0 bytes .../converter/StringToIntegerConverter.class | Bin 964 -> 0 bytes .../converter/StringToIntegerUtil.class | Bin 821 -> 0 bytes .../soft/line/util/pagehelper/PageBeans.class | Bin 2572 -> 0 bytes .../soft/line/util/pagehelper/PageUtil.class | Bin 1748 -> 0 bytes .../com/soft/line/util/poi/PoiUtils.class | Bin 18374 -> 0 bytes .../line/util/redis/JedisProperties.class | Bin 2023 -> 0 bytes .../soft/line/util/redis/RedisClient.class | Bin 11569 -> 0 bytes .../soft/line/util/redis/RedisConfig.class | Bin 2566 -> 0 bytes .../com/soft/line/xss/HTMLFilter.class | Bin 14400 -> 0 bytes .../classes/com/soft/line/xss/XssFilter.class | Bin 1998 -> 0 bytes .../xss/XssHttpServletRequestWrapper.class | Bin 1365 -> 0 bytes .../line/xss/XssJacksonDeserializer.class | Bin 1358 -> 0 bytes .../soft/line/xss/XssJacksonSerializer.class | Bin 1560 -> 0 bytes target/classes/log4j.properties | 10 - .../SoftlineFilesManageApplicationTests.class | Bin 570 -> 0 bytes 140 files changed, 3123 deletions(-) delete mode 100644 target/classes/api/API.json delete mode 100644 target/classes/api/Api doc.md delete mode 100644 target/classes/application.properties delete mode 100644 target/classes/com/soft/line/SoftlineFilesManageApplication.class delete mode 100644 target/classes/com/soft/line/aop/Permission.class delete mode 100644 target/classes/com/soft/line/aop/PermissionAspect.class delete mode 100644 target/classes/com/soft/line/common/AppletSystemConstant.class delete mode 100644 target/classes/com/soft/line/common/GlobalExceptionHandler.class delete mode 100644 target/classes/com/soft/line/common/WebMvcConfig.class delete mode 100644 target/classes/com/soft/line/controller/AppletCertificateController.class delete mode 100644 target/classes/com/soft/line/controller/AppletCommonController.class delete mode 100644 target/classes/com/soft/line/controller/AppletContractController.class delete mode 100644 target/classes/com/soft/line/controller/AttachmentController.class delete mode 100644 target/classes/com/soft/line/controller/CertificateInfoController.class delete mode 100644 target/classes/com/soft/line/controller/CodeDetailController.class delete mode 100644 target/classes/com/soft/line/controller/CommonController.class delete mode 100644 target/classes/com/soft/line/controller/ContractInfoController.class delete mode 100644 target/classes/com/soft/line/controller/LoginController.class delete mode 100644 target/classes/com/soft/line/controller/MenuInfoController.class delete mode 100644 target/classes/com/soft/line/controller/MpLoginController.class delete mode 100644 target/classes/com/soft/line/controller/RoleInfoController.class delete mode 100644 target/classes/com/soft/line/controller/StatisticsController.class delete mode 100644 target/classes/com/soft/line/controller/UserInfoController.class delete mode 100644 target/classes/com/soft/line/druid/DruidConfig.class delete mode 100644 target/classes/com/soft/line/druid/DruidFilter.class delete mode 100644 target/classes/com/soft/line/druid/DruidServlet.class delete mode 100644 target/classes/com/soft/line/entity/AppletCertificate.class delete mode 100644 target/classes/com/soft/line/entity/AppletContract.class delete mode 100644 target/classes/com/soft/line/entity/AttachmentInfo.class delete mode 100644 target/classes/com/soft/line/entity/ButtonInfo.class delete mode 100644 target/classes/com/soft/line/entity/CertificateInfo.class delete mode 100644 target/classes/com/soft/line/entity/CodeDetail.class delete mode 100644 target/classes/com/soft/line/entity/ContractInfo.class delete mode 100644 target/classes/com/soft/line/entity/MenuButtonInfo.class delete mode 100644 target/classes/com/soft/line/entity/MenuInfo.class delete mode 100644 target/classes/com/soft/line/entity/RoleInfo.class delete mode 100644 target/classes/com/soft/line/entity/RoleMenu.class delete mode 100644 target/classes/com/soft/line/entity/UserInfo.class delete mode 100644 target/classes/com/soft/line/entity/UserInfoToken.class delete mode 100644 target/classes/com/soft/line/entity/UserPermission.class delete mode 100644 target/classes/com/soft/line/entity/WorkJournal.class delete mode 100644 target/classes/com/soft/line/filter/ConfigurationFilter$MyFilter.class delete mode 100644 target/classes/com/soft/line/filter/ConfigurationFilter.class delete mode 100644 target/classes/com/soft/line/filter/GlobalApplicationContextHolder.class delete mode 100644 target/classes/com/soft/line/filter/GsonUtil.class delete mode 100644 target/classes/com/soft/line/filter/HttpRequestUtil.class delete mode 100644 target/classes/com/soft/line/filter/ResponseWrapper$Meta.class delete mode 100644 target/classes/com/soft/line/filter/ResponseWrapper.class delete mode 100644 target/classes/com/soft/line/filter/StatusCode.class delete mode 100644 target/classes/com/soft/line/filter/Token.class delete mode 100644 target/classes/com/soft/line/filter/UserTokenDto.class delete mode 100644 target/classes/com/soft/line/mapper/AppletCertificateMapper.class delete mode 100644 target/classes/com/soft/line/mapper/AppletCertificateMapper.xml delete mode 100644 target/classes/com/soft/line/mapper/AppletCommonMapper.class delete mode 100644 target/classes/com/soft/line/mapper/AppletCommonMapper.xml delete mode 100644 target/classes/com/soft/line/mapper/AppletContractMapper.class delete mode 100644 target/classes/com/soft/line/mapper/AppletContractMapper.xml delete mode 100644 target/classes/com/soft/line/mapper/AttachmentInfoMapper.class delete mode 100644 target/classes/com/soft/line/mapper/AttachmentInfoMapper.xml delete mode 100644 target/classes/com/soft/line/mapper/ButtonInfoMapper.class delete mode 100644 target/classes/com/soft/line/mapper/ButtonInfoMapper.xml delete mode 100644 target/classes/com/soft/line/mapper/CertificateInfoMapper.class delete mode 100644 target/classes/com/soft/line/mapper/CertificateInfoMapper.xml delete mode 100644 target/classes/com/soft/line/mapper/CodeDetailMapper.class delete mode 100644 target/classes/com/soft/line/mapper/CodeDetailMapper.xml delete mode 100644 target/classes/com/soft/line/mapper/ContractInfoMapper.class delete mode 100644 target/classes/com/soft/line/mapper/ContractInfoMapper.xml delete mode 100644 target/classes/com/soft/line/mapper/MenuButtonInfoMapper.class delete mode 100644 target/classes/com/soft/line/mapper/MenuButtonInfoMapper.xml delete mode 100644 target/classes/com/soft/line/mapper/MenuInfoMapper.class delete mode 100644 target/classes/com/soft/line/mapper/MenuInfoMapper.xml delete mode 100644 target/classes/com/soft/line/mapper/RoleInfoMapper.class delete mode 100644 target/classes/com/soft/line/mapper/RoleInfoMapper.xml delete mode 100644 target/classes/com/soft/line/mapper/RoleMenuMapper.class delete mode 100644 target/classes/com/soft/line/mapper/RoleMenuMapper.xml delete mode 100644 target/classes/com/soft/line/mapper/UserInfoMapper.class delete mode 100644 target/classes/com/soft/line/mapper/UserInfoMapper.xml delete mode 100644 target/classes/com/soft/line/mapper/WorkJournalMapper.class delete mode 100644 target/classes/com/soft/line/mapper/WorkJournalMapper.xml delete mode 100644 target/classes/com/soft/line/service/AppletCertificateService.class delete mode 100644 target/classes/com/soft/line/service/AppletCommonService.class delete mode 100644 target/classes/com/soft/line/service/AppletContractService.class delete mode 100644 target/classes/com/soft/line/service/AttachMentInfoService.class delete mode 100644 target/classes/com/soft/line/service/ButtonInfoService.class delete mode 100644 target/classes/com/soft/line/service/CertificateInfoService.class delete mode 100644 target/classes/com/soft/line/service/CodeDetailService.class delete mode 100644 target/classes/com/soft/line/service/ContractInfoService.class delete mode 100644 target/classes/com/soft/line/service/LoginService.class delete mode 100644 target/classes/com/soft/line/service/MenuInfoService.class delete mode 100644 target/classes/com/soft/line/service/RoleInfoService.class delete mode 100644 target/classes/com/soft/line/service/StatisticsService.class delete mode 100644 target/classes/com/soft/line/service/UserInfoService.class delete mode 100644 target/classes/com/soft/line/service/impl/AppletCertificateServiceImpl.class delete mode 100644 target/classes/com/soft/line/service/impl/AppletCommonServiceImpl.class delete mode 100644 target/classes/com/soft/line/service/impl/AppletContractServiceImpl.class delete mode 100644 target/classes/com/soft/line/service/impl/AttachmentInfoServiceImpl.class delete mode 100644 target/classes/com/soft/line/service/impl/ButtonInfoServiceImpl.class delete mode 100644 target/classes/com/soft/line/service/impl/CertificateInfoServiceImpl.class delete mode 100644 target/classes/com/soft/line/service/impl/CodeDetailServiceImpl.class delete mode 100644 target/classes/com/soft/line/service/impl/ContractInfoServiceImpl.class delete mode 100644 target/classes/com/soft/line/service/impl/LoginServiceImpl.class delete mode 100644 target/classes/com/soft/line/service/impl/MenuInfoServiceImpl.class delete mode 100644 target/classes/com/soft/line/service/impl/RoleInfoServiceImpl.class delete mode 100644 target/classes/com/soft/line/service/impl/StatisticsServiceImpl.class delete mode 100644 target/classes/com/soft/line/service/impl/UserInfoServiceImpl.class delete mode 100644 target/classes/com/soft/line/util/MP/AjaxResult$Type.class delete mode 100644 target/classes/com/soft/line/util/MP/AjaxResult.class delete mode 100644 target/classes/com/soft/line/util/MP/DateUtil.class delete mode 100644 target/classes/com/soft/line/util/MP/HttpClientUtil.class delete mode 100644 target/classes/com/soft/line/util/MP/OpenIdUtil.class delete mode 100644 target/classes/com/soft/line/util/MP/SystemConstant.class delete mode 100644 target/classes/com/soft/line/util/WebToolUtils.class delete mode 100644 target/classes/com/soft/line/util/config/Swagger2Config.class delete mode 100644 target/classes/com/soft/line/util/exception/Asserts.class delete mode 100644 target/classes/com/soft/line/util/exception/CommonResult.class delete mode 100644 target/classes/com/soft/line/util/exception/GlobalException.class delete mode 100644 target/classes/com/soft/line/util/exception/IErrorCode.class delete mode 100644 target/classes/com/soft/line/util/exception/ResultCode.class delete mode 100644 target/classes/com/soft/line/util/exception/ResultData.class delete mode 100644 target/classes/com/soft/line/util/generator/mybatis-generator.xml delete mode 100644 target/classes/com/soft/line/util/jackson/converter/ConverterConfig.class delete mode 100644 target/classes/com/soft/line/util/jackson/converter/StringToDateConverter.class delete mode 100644 target/classes/com/soft/line/util/jackson/converter/StringToDateUtil.class delete mode 100644 target/classes/com/soft/line/util/jackson/converter/StringToDoubleConverter.class delete mode 100644 target/classes/com/soft/line/util/jackson/converter/StringToDoubleUtil.class delete mode 100644 target/classes/com/soft/line/util/jackson/converter/StringToIntegerConverter.class delete mode 100644 target/classes/com/soft/line/util/jackson/converter/StringToIntegerUtil.class delete mode 100644 target/classes/com/soft/line/util/pagehelper/PageBeans.class delete mode 100644 target/classes/com/soft/line/util/pagehelper/PageUtil.class delete mode 100644 target/classes/com/soft/line/util/poi/PoiUtils.class delete mode 100644 target/classes/com/soft/line/util/redis/JedisProperties.class delete mode 100644 target/classes/com/soft/line/util/redis/RedisClient.class delete mode 100644 target/classes/com/soft/line/util/redis/RedisConfig.class delete mode 100644 target/classes/com/soft/line/xss/HTMLFilter.class delete mode 100644 target/classes/com/soft/line/xss/XssFilter.class delete mode 100644 target/classes/com/soft/line/xss/XssHttpServletRequestWrapper.class delete mode 100644 target/classes/com/soft/line/xss/XssJacksonDeserializer.class delete mode 100644 target/classes/com/soft/line/xss/XssJacksonSerializer.class delete mode 100644 target/classes/log4j.properties delete mode 100644 target/test-classes/com/soft/line/SoftlineFilesManageApplicationTests.class diff --git a/target/classes/api/API.json b/target/classes/api/API.json deleted file mode 100644 index ecd6caf..0000000 --- a/target/classes/api/API.json +++ /dev/null @@ -1,131 +0,0 @@ -{ - "common": [ - { - "url": "/codeDetail", - "method": "get", - "desc": "获取codeDetail", - "params": { - "codeType": "" - }, - "response": [{ - "CodeDetail": "Bean" - }] - }, { - "url": "/pageMenu", - "method": "get", - "desc": "获取所有在前端有页面的菜单", - "params": { - }, - "response": { - "data": "返回所有有按钮的菜单(子菜单)，和该页面包含的按钮列表" - } - }, { - "url": "/roleNames", - "method": "get", - "desc": "获取所有角色名称", - "params": { - }, - "response": { - "data": [ - { - "id": "1", - "roleName": "管理员" - } - ] - } - } - ], - "登录": [ - { - "url": "/auth/login", - "method": "post", - "desc": "登录", - "params": { - "userName": "", - "password": "" - } - }, { - "url": "/auth/logout", - "method": "post", - "desc": "登出", - "params": {} - }, { - "url": "/auth/userInfo", - "method": "get", - "desc": "获取登录用户有权限的页面和页面上的按钮", - "params": { - "userId": "" - }, - "response": { - "userInfo": { - "menuList": [{ - "buttonList": [{ - - }] - }] - } - } - } - ], - "用户管理": [ - { - "url": "/systemAdmin/accounts", - "method": "get", - "desc": "查询用户列表", - "params": { - "pageNo": 1, - "pageSize": 10, - "userName": "", - "roleId": "", - "status": "" - }, - "response": { - "data": [], - "pageSize": 10, - "pageNo": 0, - "totalPage": 1, - "totalCount": 2 - } - } - ], - "角色管理": [ - { - "url": "/systemAdmin/roles", - "method": "get", - "desc": "查询角色列表", - "params": { - "pageNo": 1, - "pageSize": 10, - "roleName": "", - "status": "" - }, - "response": { - "data": [], - "pageSize": 10, - "pageNo": 0, - "totalPage": 1, - "totalCount": 2 - } - } - ], - "菜单管理": [ - { - "url": "/systemAdmin/menus", - "method": "get", - "desc": "查询所有菜单列表", - "params": { - "pageNo": 1, - "pageSize": 10, - "menuName": "", - "menuUrl": "" - }, - "response": { - "data": [], - "pageSize": 10, - "pageNo": 0, - "totalPage": 1, - "totalCount": 2 - } - } - ] -} diff --git a/target/classes/api/Api doc.md b/target/classes/api/Api doc.md deleted file mode 100644 index 06ad7dc..0000000 --- a/target/classes/api/Api doc.md +++ /dev/null @@ -1,1294 +0,0 @@ -# Api doc - -## 通用说明 - -* 接口通用前缀 - - > http://192.168.0.168:8081/softline - > - > - -* 请求头部 - - >Access-Token: 4291d7da9005377ec9aec4a71ea837f - > - >content-Type: application/json - -* 返回体 - - ```javascript - { - 'message': '', - 'timestamp': 0, - 'result': [], //返回数据 - 'code': 200 // 200 500 401 .. - }， - { - 'message': '', - 'timestamp': 0, - 'result': { - 'list': [{ Object }], - 'pageSize': 10, // 页面大小 - 'pageNum': 0, // 当前页 - 'pages': 1, // 总页数 - 'total': 2 // 数据总数 - }, - 'code': 200 - } - ``` - -* 错误码 - - | 错误代码 | 返回msg | - | :------: | :------------: | - | 400 | 请求参数有误 | - | 401 | 用户未登录 | - | 404 | 资源未找到 | - | 405 | 请求方式不支持 | - | 500 | 服务器错误 | - -## 1.通用接口 （common） - -### 1.1 枚举值 - -* 说明 - - 获取枚举值codeDetail - -* URL - - >`GET` - > - >[/codeDetail/{codeType}](/codeDetail/{codeType}) - -* path参数 - -| 参数名 | 必填 | 说明 | -| :------- | ---- | ---- | -| codeType | yes | | - -* 返回结果（data） - -``` javascript -[{ - codeType: 1, - codeDetail: 1, - codeContent1: '金融科技与服务事业部', - codeContent2: '', - codeContent3: '', - codeContent4: '', - note: '' -}, { - codeType: 1, - codeDetail: 2, - codeContent1: '国资与企业管控', - codeContent2: '', - codeContent3: '', - codeContent4: '', - note: '' -}...] -``` - -### 1.2 按钮列表 - - * 说明 - - 获取所有按钮列表 - -* URL - - > `get` - > - > [/buttons](/button) - -* 无参数 - -* 返回结果(data) - -```javascript -[{ - id: 1, - buttonName: '查询', - buttonType: 'query' -}, { - id: 2, - buttonName: '新增', - buttonType: 'add' -}, { - id: 3, - buttonName: '修改', - buttonType: 'edit' -}, { - id: 4, - buttonName: '删除', - buttonType: 'delete' -} - ... -] -``` - - -### 1.3 获取所有有操作按钮的页面 - -* 说明 - - 获取所有有操作按钮的页面(子菜单)，用于角色管理页面，供角色选择权限 - -* URL - - > `GET` - > - > [/pageMenu](pageMenu) - -* 无参数 - -* 返回结果（data） - -``` javascript -[ - { - id: '1', - menuName: '用户管理', - buttonList: [{ buttonName: '新增', buttonType: 'add' }, { buttonName: '查询', buttonType: 'query' }, - { buttonName: '删除', buttonType: 'delete' }, { buttonName: '编辑', buttonType: 'edit' }, - { buttonName: '修改密码', buttonType: 'changePassword' }] - }, { - id: '2', - menuName: '角色管理', - buttonList: [{ buttonName: '新增', buttonType: 'add' }, { buttonName: '查询', buttonType: 'query' }, - { buttonName: '删除', buttonType: 'delete' }, { buttonName: '编辑', buttonType: 'edit' }] - }, { - id: '3', - menuName: '菜单管理', - buttonList: [{ buttonName: '新增', buttonType: 'add' }, { buttonName: '查询', buttonType: 'query' }, - { buttonName: '删除', buttonType: 'delete' }, { buttonName: '编辑', buttonType: 'edit' }] - } -] -``` - -### 1.4 获取所有顶级菜单 - -* 说明 - - 获取所有顶级菜单，在菜单管理页面下拉框展示 - -* URL - - > `GET` - > - > [/topMenu](/topMenu) - -* 无参数 - -* 返回结果（data） - -```javascript -[{ - id: '1', - menuName: '系统管理' -},{ - id: '5', - menuName: '数据管理' -},{ - id: '8', - menuName: '统计管理' -}] -``` - -### 1.5 获取所有角色名 - -* 说明 - - 获取所有角色名，在用户管理页面，下拉框选择角色 - -* URL - - >`GET` - > - >[/roleNames](/roleNames) - -* 无参数 - -* 返回结果（data） - -```javascript -[ - { - id: '1', - roleName: '管理员' - }, { - id: '2', - roleName: '普通用户' - }, { - id: '3', - roleName: '其他' - } -] -``` - -## 2 用户接口 （auth） - -### 2.1 用户登录 - -* 说明 - - 登录系统，颁发token - -* URL - - > `POST` - > - > [/auth/login](/auth/login) - -* body参数 - -| 参数名 | 必填 | 说明 | -| -------- | ---- | ---- | -| userName | yes | | -| password | yes | | - -* 返回结果(data) - -``` javascript -{ - 'message': '登录成功', - 'timestamp': 0, - 'data': { - 'token': '4291d7da9005377ec9aec4a71ea837f', - 'roleId': '1' - } - 'code': 200 -} -``` - -### 2.2 用户登出 - -* 说明 - - 用户退出系统，注销token - -* URL - - >`POST` - > - >[/auth/logout](/auth/logout) - -* 无参数 - -* 返回结果 - -``` javascript - -``` - -### 2.3 获取用户的权限列表 - -* 说明 - - 获取用户角色对应的权限列表，形成前端路由 - -* URL - - > `GET` - > - > [/auth/userInfo](/auth/userInfo) - -* 无参数 - -* 返回结果 - -```javascript - -``` - -## 3 用户管理接口 （systemAdmin） - -### 3.1 获取所有用户列表 - -* 说明 - - 获取所有用户列表 - -* URL - - >`GET` - > - >[/accounts](/accounts) - -* body参数 - -| 参数名 | 必填 | 说明 | -| -------- | ---- | ---- | -| userName | no | | -| roleId | no | | -| status | no | | -| pageNum | yes | | -| pageSize | yes | | - -* 返回结果（list） - -``` javascript -[{ - id: 1, - userName: 'admin', - status: 1, - phone: 13312345678, - modifyTime: 1497160610259, - avatar: '', - roleId: 1 -}, { - id: 2, - userName: '迪迦', - status: 2, - phone: 13312345678, - modifyTime: 1497160610259, - avatar: '', - roleId: 2 -}, { - id: 3, - userName: '海泽王', - status: 2, - phone: 13312345678, - modifyTime: 1497160610259, - avatar: '', - roleId: 2 -}] -``` - -### 3.2 新增用户 - -* 说明 - - 新增用户 - -* URL - - > `POST` - > - > [/accounts](/accounts) - -* body参数 - -| 参数名 | 必填 | 说明 | -| ---------- | ---- | ------------ | -| userName | yes | | -| password | yes | | -| phone | yes | | -| roleId | yes | | -| userStatus | yes | | -| avatar | no | 系统默认生成 | - -* 返回结果 - -``` javascript -{ - 'message': '保存成功', - 'timestamp': 0, - 'data': null, - 'code': 200 -} -``` - -### 3.3 修改用户 - -* 说明 - - 修改用户 - -* URL - - > `PUT` - > - > [/accounts](/accounts) - -* body参数 - -| 参数名 | 必填 | 说明 | -| ---------- | ---- | ------ | -| id | yes | 用户id | -| userName | yes | | -| phone | yes | | -| roleId | yes | | -| userStatus | yes | | -| avatar | no | | - -* 返回结果 - -``` javascript -{ - 'message': '保存成功', - 'timestamp': 0, - 'data': null, - 'code': 200 -} -``` - -### 3.4 删除用户 - -* 说明 - - 删除用户 - -* URL - - >`DELETE` - > - >[/accounts](/accounts) - -* body参数 - -| 参数名 | 必填 | 说明 | -| ------ | ---- | ------ | -| id | 必填 | 用户Id | - -* 返回结果 - -``` javascript -{ - 'message': '删除成功', - 'timestamp': 0, - 'data': null, - 'code': 200 -} -``` - -### 3.5 修改密码 - -* 说明 - - 修改密码 - -* URL - - > `POST` - > - > [/changePassword](/changePassword) - -* body参数 - -| 参数名 | 必填 | 说明 | -| -------------- | ---- | ------------ | -| id | 必填 | 修改用户的id | -| oldPassword | 必填 | 老密码 | -| newPassword | 必填 | 新密码 | -| confimPassword | 必填 | 确认密码 | - -* 返回结果 - -``` javascript -{ - 'message': '修改成功', - 'timestamp': 0, - 'data': null, - 'code': 200 -} -``` - -## 4 角色管理接口 (systemAdmin) - -### 4.1 获取所有角色列表 - -* 说明 - - 获取所有角色列表，包含该角色对应的菜单按钮 - -* URL - - > `GET` - > - > [/roles](/roles) - -* body参数 - -| 参数名 | 必填 | 说明 | -| -------- | ---- | ---- | -| roleName | no | | -| pageNum | yes | | -| pageSize | yes | | - -* 返回结果（list） - -``` javascript -[{ - 'id': '1', - 'roleName': '管理员', - 'status': 1, - 'describe': '管理员权限', - 'menuList': [{ - 'menuId': '1', - 'menuName': '用户管理', - 'buttonList': ['query', 'delete', 'edit', 'add', 'changePassword'] - }, { - 'menuId': '2', - 'menuName': '角色管理', - 'buttonList': ['query', 'delete', 'edit', 'add'] - }, { - 'menuId': '3', - 'menuName': '菜单管理', - 'buttonList': ['query', 'delete', 'edit', 'add'] - }, { - 'menuId': '4', - 'menuName': '合同管理', - 'buttonList': ['query', 'delete', 'edit', 'add', 'import', 'export'] - }, { - 'menuId': '5', - 'menuName': '证书管理', - 'buttonList': ['query', 'delete', 'edit', 'add', 'import'] - }] -}] -``` - -### 4.2 新增角色 ? - -* 说明 - - 新增角色 - -* URL - - > `POST` - > - > [/roles](/roles) - -* body参数 - -| 参数名 | 必填 | 说明 | -| -------- | ---- | ---- | -| roleName | yes | | -| describe | no | | -| menu | yes | | - -* 参数举例 - -``` javascript -{ - 'roleName': '管理员' - 'describe': '描述字段' - 'menu': [{ - 'menuId': '1', - 'buttonList': ['query', 'edit', 'add'] - }, { - 'menuId': '2', - 'buttonList': ['add', 'edit'] - }...] -} -``` - -* 返回结果 - -``` javascript -{ - 'message': '保存成功', - 'timestamp': 0, - 'data': null, - 'code': 200 -} -``` - -### 4.3 修改角色 ? - -* 说明 - - 修改角色 - -* URL - - > `PUT` - > - > [/roles](/roles) - -* body参数 - -| 参数名 | 必填 | 说明 | -| -------- | ---- | ------ | -| id | yes | 角色Id | -| roleName | yes | | -| describe | no | | -| menu | yes | | - -* 参数举例 - -``` javascript -{ - 'id': 1 - 'roleName': '管理员' - 'describe': '描述字段' - 'menu': [{ - 'menuId': '1', - 'buttonList': ['query', 'edit', 'add'] - }, { - 'menuId': '2', - 'buttonList': ['add', 'edit'] - }...] -} -``` - -* 返回结果 - -``` javascript -{ - 'message': '保存成功', - 'timestamp': 0, - 'data': null, - 'code': 200 -} -``` - -### 4.4 删除角色 - -* 说明 - - 删除角色 - -* URL - - >`DELETE` - > - >[/roles](/roles) - -* body参数 - -| 参数名 | 必填 | 说明 | -| ------ | ---- | ------ | -| id | 必填 | roleId | - -* 返回结果 - -``` javascript -{ - 'message': '删除成功', - 'timestamp': 0, - 'data': null, - 'code': 200 -} -``` - -## 5 菜单管理接口 （systemAdmin） - -### 5.1 获取所有菜单列表 - -* 说明 - - 获取所有菜单列表，包含该角色对应的按钮列表 - -* URL - - > `GET` - > - > [/menu](/menu) - -* body参数 - -| 参数名 | 必填 | 说明 | -| -------- | ---- | ---- | -| menuName | no | | -| menuUrl | no | | -| pageNum | yes | | -| pageSize | yes | | - -* 返回结果（list） - -``` javascript -[ - { - id: '1', - menuName: '系统管理', - menuIcon: 'setting', - state: '1', - menuUrl: '/systemAdmin', - orderBy: '1', - pId: '-1', - modifyTime: '202005211526', - buttonList: [] - }, - { - id: '2', - menuName: '用户管理', - menuIcon: 'setting', - state: '2', - menuUrl: '/systemAdmin/account', - orderBy: '1', - pId: '1', - modifyTime: '202005211526', - buttonList: [{ - buttonName: '新增', buttonType: 'add' - }, { - buttonName: '查询', buttonType: 'query' - }, { - buttonName: '删除', buttonType: 'delete' - }, { - buttonName: '编辑', buttonType: 'edit' - }] - }... -] -``` - -### 5.2 新增菜单 - -* 说明 - - 新增菜单 - -* URL - - > `POST` - > - > [/menus](/menus) - -* body参数 - -| 参数名 | 必填 | 说明 | -| ---------- | ---- | ------------------ | -| menuName | yes | | -| menuUrl | yes | | -| menuIcon | yes | | -| pId | yes | 顶级菜单-1 | -| buttonList | no | 顶级菜单没有button | - -* 参数举例 - -``` javascript -{ - menuName: '用户管理' - menuUrl: '/accounts' - menuIcon: 'setting' - pId: '1' - buttonList: ['add', 'edit', 'query'] -} -``` - -* 返回结果 - -``` javascript -{ - 'message': '保存成功', - 'timestamp': 0, - 'data': null, - 'code': 200 -} -``` - -### 5.3 修改菜单 - -* 说明 - - 修改菜单 - -* URL - - > `PUT` - > - > [/menus](/menus) - -* body参数 - -| 参数名 | 必填 | 说明 | -| ---------- | ---- | ------------------ | -| id | yes | 菜单id | -| menuName | yes | | -| menuUrl | yes | | -| menuIcon | yes | | -| pId | yes | | -| buttonList | no | 顶级菜单没有button | - -* 参数举例 - -``` javascript -{ - 'id': 1 - 'roleName': '管理员' - 'describe': '描述字段' - 'menu': [{ - 'menuId': '1', - 'buttonList': ['query', 'edit', 'add'] - }, { - 'menuId': '2', - 'buttonList': ['add', 'edit'] - }...] -} -``` - -* 返回结果 - -``` javascript -{ - 'message': '保存成功', - 'timestamp': 0, - 'data': null, - 'code': 200 -} -``` - -### 5.4 删除菜单 - -* 说明 - - 删除菜单 - -* URL - - >`DELETE` - > - >[/menus](/menus) - -* body参数 - -| 参数名 | 必填 | 说明 | -| ------ | ---- | ------ | -| id | 必填 | 菜单ID | - -* 返回结果 - -``` javascript -{ - 'message': '删除成功', - 'timestamp': 0, - 'data': null, - 'code': 200 -} -``` - -## 6 合同管理接口 （dataManage） - -### 6.1 获取所有合同 - -* 说明 - - 获取所有合同 - -* URL - - > `GET` - > - > [/contract](/contract) - -* body参数 - -| 参数名 | 必填 | 说明 | -| ------------ | ---- | ------------ | -| depId | no | 部门id | -| contractName | no | | -| proId | no | 项目id | -| totalAmount | no | 大于这个金额 | -| partA | no | | -| partB | no | | -| signTime | no | | -| signAddr | no | | -| beginDate | no | | -| endDate | no | | -| payment | no | | -| pageNum | yes | | -| pageSize | yes | | - -* 返回结果（list） - -``` javascript -[{ - id: 1, - depId: 1, - contractName: '合同1', - proId: 1, - totalAmount: '10000000', - partA: 'A', - partB: 'B', - signTime: '20200521', - signAddr: 'SH', - beginDate: '20200521', - endDate: '20250521', - payment: 'cash', - note: 'xxxx', - modifyTime: '20200521223000', - modifyPerson: 'admin' -}] -``` - -### 6.2 新增合同 - -* 说明 - - 新增合同 - -* URL - - > `POST` - > - > [/contract](/contract) - -* body参数 - -| 参数名 | 必填 | 说明 | -| ------------ | ---- | ------------ | -| depId | yes | 部门id | -| contractName | yes | | -| proId | yes | 项目id | -| totalAmount | yes | 大于这个金额 | -| partA | yes | | -| partB | yes | | -| signTime | yes | | -| signAddr | yes | | -| beginDate | yes | | -| endDate | yes | | -| payment | yes | | -| note | no | | - -* 参数举例 - -``` javascript -{ - beginDate: "20200501" - contractName: "请问" - depId: 1 - endDate: "20200610" - note: "请问" - partA: "请问" - partB: " 请问" - payment: 1 - proId: 1 - signAddr: "请问" - signTime: "20200519" - totalAmount: " 请问" -} -``` - -* 返回结果 - -``` javascript -{ - 'message': '保存成功', - 'timestamp': 0, - 'data': null, - 'code': 200 -} -``` - -### 6.3 修改合同 - -* 说明 - - 修改合同 - -* URL - - > `PUT` - > - > [/contract](/contract) - -* body参数 - -| 参数名 | 必填 | 说明 | -| ------------ | ---- | ------------ | -| depId | yes | 部门id | -| contractName | yes | | -| proId | yes | 项目id | -| totalAmount | yes | 大于这个金额 | -| partA | yes | | -| partB | yes | | -| signTime | yes | | -| signAddr | yes | | -| beginDate | yes | | -| endDate | yes | | -| payment | yes | | -| note | no | | - -* 参数举例 - -``` javascript -{ - id: 1 - beginDate: "20200501" - contractName: "请问" - depId: 1 - endDate: "20200610" - note: "请问" - partA: "请问" - partB: " 请问" - payment: 1 - proId: 1 - signAddr: "请问" - signTime: "20200519" - totalAmount: " 请问" -} -``` - -* 返回结果 - -``` javascript -{ - 'message': '保存成功', - 'timestamp': 0, - 'data': null, - 'code': 200 -} -``` - -### 6.4 删除合同 - -* 说明 - - 删除合同 - -* URL - - >`DELETE` - > - >[/contract](/contract) - -* body参数 - -| 参数名 | 必填 | 说明 | -| ------ | ---- | ------ | -| id | 必填 | 合同id | - -* 返回结果 - -``` javascript -{ - 'message': '删除成功', - 'timestamp': 0, - 'data': null, - 'code': 200 -} -``` - -## 7 证书管理接口 （dataManage） - -### 5.1 获取所有菜单列表 - -* 说明 - - 获取所有菜单列表，包含该角色对应的按钮列表 - -* URL - - > `GET` - > - > [/menu](/menu) - -* body参数 - -| 参数名 | 必填 | 说明 | -| -------- | ---- | ---- | -| menuName | no | | -| menuUrl | no | | -| pageNum | yes | | -| pageSize | yes | | - -* 返回结果（list） - -``` javascript -[ - { - id: '1', - menuName: '系统管理', - menuIcon: 'setting', - state: '1', - menuUrl: '/systemAdmin', - orderBy: '1', - pId: '-1', - modifyTime: '202005211526', - buttonList: [] - }, - { - id: '2', - menuName: '用户管理', - menuIcon: 'setting', - state: '2', - menuUrl: '/systemAdmin/account', - orderBy: '1', - pId: '1', - modifyTime: '202005211526', - buttonList: [{ - buttonName: '新增', buttonType: 'add' - }, { - buttonName: '查询', buttonType: 'query' - }, { - buttonName: '删除', buttonType: 'delete' - }, { - buttonName: '编辑', buttonType: 'edit' - }] - }... -] -``` - -### 4.2 新增菜单 - -* 说明 - - 新增菜单 - -* URL - - > `POST` - > - > [/menus](/menus) - -* body参数 - -| 参数名 | 必填 | 说明 | -| ---------- | ---- | ------------------ | -| menuName | yes | | -| menuUrl | yes | | -| menuIcon | yes | | -| pId | yes | 顶级菜单-1 | -| buttonList | no | 顶级菜单没有button | - -* 参数举例 - -``` javascript -{ - menuName: '用户管理' - menuUrl: '/accounts' - menuIcon: 'setting' - pId: '1' - buttonList: ['add', 'edit', 'query'] -} -``` - -* 返回结果 - -``` javascript -{ - 'message': '保存成功', - 'timestamp': 0, - 'data': null, - 'code': 200 -} -``` - -### 4.3 修改菜单 - -* 说明 - - 修改菜单 - -* URL - - > `PUT` - > - > [/menus](/menus) - -* body参数 - -| 参数名 | 必填 | 说明 | -| ---------- | ---- | ------------------ | -| id | yes | 菜单id | -| menuName | yes | | -| menuUrl | yes | | -| menuIcon | yes | | -| pId | yes | | -| buttonList | no | 顶级菜单没有button | - -* 参数举例 - -``` javascript -{ - 'id': 1 - 'roleName': '管理员' - 'describe': '描述字段' - 'menu': [{ - 'menuId': '1', - 'buttonList': ['query', 'edit', 'add'] - }, { - 'menuId': '2', - 'buttonList': ['add', 'edit'] - }...] -} -``` - -* 返回结果 - -``` javascript -{ - 'message': '保存成功', - 'timestamp': 0, - 'data': null, - 'code': 200 -} -``` - -### 4.4 删除菜单 - -* 说明 - - 删除菜单 - -* URL - - >`DELETE` - > - >[/menus](/menus) - -* body参数 - -| 参数名 | 必填 | 说明 | -| ------ | ---- | ------ | -| id | 必填 | 菜单ID | - -* 返回结果 - -``` javascript -{ - 'message': '删除成功', - 'timestamp': 0, - 'data': null, - 'code': 200 -} -``` - -## 8 附件管理接口 (attachment) - -### 8.1 获取附件列表 - -* 说明 - - 获取合同或是证书的附件列表 - -* URL - - > `GET` - > - > [/attachment/{attachmentType}/{id}](/attachment/{attachmentType}/{id}) - -* path参数 - -| 参数名 | 必填 | 说明 | -| -------------- | ---- | ------------------------ | -| attachmentType | yes | 合同附件：1，证书附件：2 | -| id | yes | 合同id，或是证书id | - -* 返回结果（result） - -``` javascript -[{ - id: '1', - attachmentName: '附件1.doc', - attachmentUrl: 'blob:http://149.25.11.1/qweasdczxc156qwead.doc' -}, { - id: '2', - attachmentName: '附件2.doc', - attachmentUrl: 'blob:http://149.25.11.1/qweasdczxc156qwead.doc' -}, { - id: '3', - attachmentName: '附件3.doc', - attachmentUrl: 'blob:http://149.25.11.1/qweasdczxc156qwead.doc' -}] -``` - -### 8.2 上传附件 - -* 说明 - - 上传附件 - -* URL - - > `POST` - > - > [/upload](/upload) - -* body参数 - -|参数名|必填|说明| -|||| -|| - diff --git a/target/classes/application.properties b/target/classes/application.properties deleted file mode 100644 index 52230f2..0000000 --- a/target/classes/application.properties +++ /dev/null @@ -1,67 +0,0 @@ -server.port=9100 -server.servlet.context-path=/softline -#spring.datasource.url= jdbc:mysql://175.24.112.245:3306/rz_archives?characterEncoding=utf-8&useSSL=false -spring.datasource.url= jdbc:mysql://127.0.0.1:3306/rz_archives?characterEncoding=utf-8&useSSL=false -spring.datasource.username=root -spring.datasource.password=root -spring.datasource.driver-class-name=com.mysql.jdbc.Driver -#ݿӳ -spring.datasource.type=com.alibaba.druid.pool.DruidDataSource -spring.datasource.druid.initialSize=5 -spring.datasource.druid.minIdle=5 -spring.datasource.druid.maxActive=20 -spring.datasource.druid.maxWait=60000 -spring.datasource.druid.timeBetweenEvictionRunsMillis=60000 -spring.datasource.druid.minEvictableIdleTimeMillis=300000 -spring.datasource.druid.validationQuery=SELECT?1?FROM?DUAL -spring.datasource.druid.testWhileIdle=true -spring.datasource.druid.testOnBorrow=true -spring.datasource.druid.testOnReturn=true -spring.datasource.druid.poolPreparedStatements=true -spring.datasource.druid.filters=stat,wall -spring.datasource.druid.maxPoolPreparedStatementPerConnectionSize=20 -spring.datasource.druid.useGlobalDataSourceStat=true -spring.datasource.druid.connectionProperties=druid.stat.mergeSql=true;druid.stat.slowSqlMillis=500 - -#redisӵַ -spring.jedis.host = 175.24.112.245 -spring.jedis.password= 123456 -spring.jedis.port = 6379 -spring.jedis.uri=redis://127.0.0.1:6379/11 - -spring.jedis.maxTotal=100 -spring.jedis.maxIdle= 10 -spring.jedis.maxWaitMillis =100000 - -#mybatis log -logging.level.com.soft.line.mapper = debug -pagehelper.helper-dialect=mysql -pagehelper.params=count=countSql -pagehelper.reasonable=true -pagehelper.support-methods-arguments=true -#mybatisӳļ· -#mybatis.mapper-locations=com.soft.line.mapper/*.xml -#ʵ· -mybatis.type-aliases-package=com.soft.line.entity - -#ʹmapʱ ѯijһȫΪnullʱҲش -mybatis.configuration.call-setters-on-nulls=true - -#ļϴַ -#windows -#uploadFileDir=D:/softline-files-manage-uploadFiles/ -#linux -uploadFileDir=/user/softline-files-manage-uploadFiles/ - -#ļϴӳַ -uploadFileMapping=uploadFiles/ - -spring.http.encoding.force=true -spring.http.encoding.charset=UTF-8 -spring.http.encoding.enabled=true -server.tomcat.uri-encoding=UTF-8 -### ļϴ -# ֵ֧ļ -spring.servlet.multipart.max-file-size=100MB -# ļ -spring.servlet.multipart.max-request-size=100MB \ No newline at end of file diff --git a/target/classes/com/soft/line/SoftlineFilesManageApplication.class b/target/classes/com/soft/line/SoftlineFilesManageApplication.class deleted file mode 100644 index cd9199c7203ceb72794359773db37e42ddb5ef57..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1809 zcmbtUYi}Dx6g?9=*~Hx@sne#E@<=EJ$89`3!lQLaX@V+Ma-hN}2=&u=J>G1)-mzxK zZNsnPAwfZcAHa`7oZYpOZApSqzU!DG@8k#lS zz|A>Sus(~{IY_)$!~6Ka!-oQu*n|T0jzc6*@=6L^JH4>2%#*;Cug8gthI%hbBev>pk{Fj4p8mE@&Qpz@ zIc&?M;@fOOsp{-pGY1$R^oW?sH1CU4hc4u<8jZB=1}bZ_-&3i6pn}IF0G(eXOIjIA zS{XT7!(8>$+CSAjnQHqa)=qYdbH@xvCeew@efT(!dD8W$#yhb}>FehIVWfu*A0Odk z51;t>6t{ewgD-GRD^TfFR zHNf0AcFY0kHA?eQ#Bj_=96#n{tJBY%+?gzsY%!JC%IoZzJY0Nv?{Pk(WMBj?mED)d z^YY6U_f+7FJ>cpJwJVmV!1c2A3k59iSgdj>*SNF=Ud@O_sY;o|<#&O9lBeJ~-TW2e zM+#F|m*X1tAQO2GV$>K~Z;u2Qdbe?j#J-jq?6a+Kvl zbAmz}EaNhfU!nFimlcmWTw#<2^cOs{xa##v^Esx!{RuO5?>Ed&;V8&?<_3az1i3)l zqhRZ}ir4ry0l!Ld7Ox*By_!SQVZHJkb3bDy!(^-YEfPOZ?{DyL3U6YC=Q2I5@_dV0 N*B(NocpKM&e*i}I{Zaq` diff --git a/target/classes/com/soft/line/aop/Permission.class b/target/classes/com/soft/line/aop/Permission.class deleted file mode 100644 index e0a0797f09a31262504270a98cc873a6acdde86b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 431 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 U$h8_;EBUyZKAXIc@-GGa4{bQ)9{>OV diff --git a/target/classes/com/soft/line/common/AppletSystemConstant.class b/target/classes/com/soft/line/common/AppletSystemConstant.class deleted file mode 100644 index 4c497a220279d80ab68aabfc6f7471b5ebfdffaf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1231 zcma*mNpI6Y6ae5iP13k&x=^4{_OfJDx*p8eDQhpXE zBo6!l&io$48@Gi);=m#H`)1xe&zA2$zkUONZE#DFgWV#$EW#@Svo%{ce6Q^ozHT@k zfrZ8q`@|}J7WXQyNW-|dLtv(s#6!VialrZ`uEFcS2G)$0r@L2e zP}}lawC4F1Z5kTXu-j?bS+`E0?Aab|__S&7TUf-9y|m@|RD-?KxT-;&z?5s&E#EU` zk+-L$y57>jBv5o{yJ^T0?+BEtM%}c0oqCx2o`7ap`iU9@@|G>zn>e?ot($vo-!WRQ zZE0X(szd9BZ|yfVuu)io9?QXR$c1JT|A61mAU95f7J+H%X7g(s6h+J&K=B8G99F^* z0N1h`#-YG1&#kN;;4ErMzzNJX!kAm5sKZl_b^6${&`7$hf56gE`lK;0K88aA>y2&_ zRffr-sPu7M1r;T6g$@RNF5K}@@aXiU@YG6fGD^FAFO+4M{*|;L&$k5lSIETU@O=R=5NCfNCC>g~#vM^w& zz+02O@y2Mwuoruw9FT=H2vXeq0UJkL=1+BaFN}32Frmof;5f?1iEJoGNe~{69i9%8 zI2+ZI+lx`a1k0kyE>DG=h9(1VJm9bl6Zoe9ScE0WLqVPvY66OAP4N`Eq<9)#Ry>2A zRXm5DS9}J&p!h8MoZ|E7Ma37;7Zop|FDbr^zM}Xl`kLbF=o^Zc(Ki*}Lf=+=2YpxZ zJ@ks=RrH$Tb@YA356~M>`MrM+(VL1NVGohl4WEy3hh-+gcVX=dkk8qcKf&i@)>wk4 S7?+O|;2Ate5qObh?fe2uq1x2| diff --git a/target/classes/com/soft/line/common/GlobalExceptionHandler.class b/target/classes/com/soft/line/common/GlobalExceptionHandler.class deleted file mode 100644 index 1f5b6e112e7a897cd00e692bbc7f3a6f500ddbb8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5171 zcmcgw{dW{s8Gdd;GMmkmB%4yCV4#>nfRqUqYGu>3$(9sspe?~@#abu3lg%WvGuzqO zP}GW4t+oZFineI|z|Z>Cl=hsEv_0CNJ^mRc#Gm{RJU(}3*vuxgAyDn%WM}T3`@YZf ze%q=fv1xA5}t0xm!UUf6xkFtn$4KNWCB(a1=w=nC@3cJ44zIwz)YfqClc@!l#|$k zDFvsJcowG>d_|z%a`FPHA;-;YC2MT|gf`^l^M;!iXzVp@)9d4!u3aMn>oQKx5NH`P zZR1$EFlx9b^ihj56wd0_i0+zl98RwD#?6wzJwsWipp~34PqQeeaa3?@?Geiv)vZI% zW{sj}I`(1R&RITY%eenq`65v03b++r)6S2%dcip5xRcr`V^llrdBx+#Gi9UX9W}gh zCwI*8hRemG<9bG}q9VO(8HciGTAFbkTg&*AjvJ-2<@Jxk*)}b5Vs({#Q^n+_oV| zQ9rV!iVXsjwL|LrEJ%ocH(xFow#QT*(Jk|q)3k5(0Nn_T!7*IdagUb#>R*u`0%txt zb80wxQ{d=9*D0)U_Q`m5OguB^=dd=wJgr3MCNpertaEEB7jXW6bZR(fAe!a3YUhSX zB`xU?82Ql3Yp~vK>4njp-dQuUo%^`^-q4wkjZPR@?~qJjMm8pSo1LW<0^K(XXH=g+ zM-|Cssn^-V(&^3eF!PVb7A+T||3kJ%jl`~v{=6}wfU${8EaPI8RZ7R;< zc@^Kpa{|iF#p$aHS2+BZRP=2XFW@^owHE(&Ve#_0g;!_h-+z97cJ`n^=fdmf=U=)! zf9Z{2>fi65qv+zfa7>2 z&(({;mQ-qK#4D}%0UtkX#h{9d_>qDit9TW!@$l_da7o2a@KY79<7X6KZkd9gQ}h=K zei^0quZx!!r>A473GDKFn`Qk&q?iXy!^-)|q~fx4&Yqj-Srq(A#jo+3Dyl&~G30T` zYwuhHl6ixzO{t{knO?Vd#pZhJ^43kD!Qa~jc1P2W?0S?_>?Zs8PE@F@AtRTui7>m7TO=Qzs%jau3gc(H| zBaaR?NkK~}&_ln+DUGC1l>|w2-^_Xem7x8W<>w%quhjKG`#u{oOR_Ir?^i-)hCX9e z8G3=+PSx^YR`z-Pm`>ui_?^Ixs9S^VtlBuksU+_tzi0X|6Rgt$TdNe0mF=wT4zV%R56sFACfr;`%FADhRV`r94${Ua~h-osrvN)^lVptxP!Ffo(P~_eD+1 zjO*^Oyb;*kF=Mn>R1iSP2Kr=xgQAG?SXvoP{m@Tq3vlH`m2Q1QpnYjCt9%k@W9%O` z#&q63DwV!*c}WlI(r$)C)>?2u6S%v|a!W6jX!3H&w1PjV_#@s_aYSynhcGCxeTj)_ zPdSr@Hsqhn+@kfd>rl;wrICWSm~camGg)R-)g!iTxEYCPFc$xa@(A?>n|*L4D0K#c z>B!c@^pw|-$V`>siPJ^n);9Ny0D8QZt2*Ab-r*8 z^;{2hzm2**GpOG)hjsOM4-HRVMPo{tL4vbQe58{6nL+a`)VH`kz)1SC9k>l!eVjW2 zT_Fy&^4~qg+e?WC<~tvnFWiHDe6HuGPx9~HlMq>d;eH$li5&@vwUJorwt!Y@eGK|e zG!su+8KAdS(Ax-jUmW_UV$kKn`|;@z{S49Tsqz4=Z<#}@z#Q5H-Ua`wWDf0hNZme* z4Rg4o4j*9SQF81KD0WvdOi>-sgLVS$ps78$*JrvdP+nnrfJ_gPzz(z^jb3_jg~uL< z;Veb^@L&w*k3~6ex&_W@a_%Lc2gtdvCg+D%=iDE|S&Hn&K*;&gFv{&g`rR4Ed2^K) zgDe|lmOT=Qb9=>m?et!TYFGH|;TZf(Yf^4sTrO)zW}mE`#O@EUWd-D>Vj(U`%It=;7NLoiZ f{tN$-eE$=s@n>v8j$@hs1|2$vJjTN}7vuj0Q5Ww! diff --git a/target/classes/com/soft/line/common/WebMvcConfig.class b/target/classes/com/soft/line/common/WebMvcConfig.class deleted file mode 100644 index 7a11d05dd3e8b8efa477f3f0b0660d4c79e589d3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1855 zcmb_cYi}Dx6g}fSymegCIFQm(3Z1>#bgq)8hZ2b7dl72?C#J9aj#cdglR zLRI)tNGO#+@QF|SD8!ky(>SpS0#%mh&V9_?d(PZDfByB$?*QiUActv`vzW_5<}iY? zhxeR({|pNFz{7`5na|-P-1P9VGk%i8r&#b%@o>w-XC7{6@p%?^vRD*2+i8cf@>hdU z-wljFVSQKaDH*D$DYvW%qGmGjRkhp9`?U#a?vLy_ z7(IR~hyr_CV5B&^Eik$q`%F8z9z=Sh)2eCnP_bkOEUv3?TbaP=J>#g|35en9dOdE* zByLz4@|>jBiX-_**Q$H<1hHFUSMicUDb9c_PVigX3;0xQQ-VZ(^4l0ea+?-GLI!J z=kXe51Tv*k9(S>l#cCe+aG%sR2y{V8hP{HBEY|Y)!r3R2ebsDgQ|<(FJGRAUyIc=d zlC+iGS&-G0hl}O4ja6xSm!C+12}vxw$|SN>61aYP_+hBPm49utW01eB?drM}SQ<8C zr<2*G@$gz4JL4QC9r*&~;^2_a4w!nZ@-96acb@_dVR0~!5o`awzJC}24(i~T3HZft z1`4dq{*N9T{@KH>t-dH6X+qM~hsC`=>6?iwe3Yj_FEaeG6S+Un$9;nGRsJs|xJU<^ zc+hc)4&g?F>l-{HDFx+N=^4aN++^@3*YVUi#ZLkGZUElGRcZp)@HV5|;XfFcq5R>- z=x@k89{Cj`kDp<*Fm{0P($C0J6g(~mIJ0$t-0`4^ZczTY|Lmh)n!-y*(S=Fwk38r4 zJX5LXsOF2T21I=im+&niDuUc+oll9#;h5>x+QY%BaUJgvPm#Vc&LBkwv*}t&`OHzj ILH%9eZ+<`#cK`qY diff --git a/target/classes/com/soft/line/controller/AppletCertificateController.class b/target/classes/com/soft/line/controller/AppletCertificateController.class deleted file mode 100644 index 8712ede69501c2c321705c52b12318308213a7bd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4145 zcmb_fYjYE26n-|nBuzu10osBUp(3JOp7)&Rq<{YX z@OJ>)@Oc<(5Uatn7_7xH3IOJ0ZLq#(Q{QXec4XLr8>>3`50m z2&oW8LeRvw(GbprkQT3FV#$P{i)U6WXT@TOB^QJlL|#IZlFg=7vqv>dZCFbvrW#X? zaV?=r*wUNO$K;$oY|3dZqslq^gWSEyi7pAN2J#tG8&ik0oEA^3-IPAY=WeqKp8a9+MbwW4J$Z=K4e}`}LgJ$EzSV zJXbZYr1K&lxrFZquk3`X7`D#FQAjz zc~CpNsypp%TFIp3m?>_!%OyDyA5{}(*DhwZBxWj!GxX+M&ayt$9MO~gA_mn|4PI1D zOiN`HGj9-p6TXzn^ix*ijXrP}fNb$raUnQQIhTL81M1nlnltz6$w?v*^V#^TIplk8bn`%36-_0^`zo-`+m%e=e-sV`y(31xc_HC!UZ(%`Y`HD*J) zaJR;gEwzZCKBl-6^kBJE_DdSQmXGFDW70O< zmzs$Yl9e%U=!LUw0UO%cVoOJJCoRC&Q!-3Mb1<*B%)A)(`1lj5yV6U=P((;2lz0E zk0SUOpGa8w_|Aoy=^y6q{W|;o)tRX;XQm#`-Fg_rrxBdTg$QJ9Aq~XUl$P1Y;^u)T z=dV1vdTZ|brP=BGJTUvy*R$XLC?S|tQepxG@mT~HafzC9w{Op0zVYPd&s2MS@i*Hv zHCb1RMcvUy-`#w4?XLTC1UrStfR<#7J-+k6_GSke!7glxU=O-ED{ay2S9fNn&d=Sr zP>3Xg148KyvAl`y2zrIRZGOng88{M_StM*xsZE>`HhV2SZ4i@YJw(pA$)c68!C_OE zZBl^W9cw6L>Nbl@SiwoRpy6;k2VkjLZVet=(+>88s=@g_KHuH_0geuGGBrOD})6yQTnnra1zaTh;&~?;A zYo-vsE1b1Yqc&i9tF+>+Lj_N~f_iL4BRVXv4Yn1>EA8QBYVgMgHSL^)MC8yxNd=@v zZ0AdrL@Dqp{{q-yLFbLO6R+`GP^8|)7fH0F6Z&6H=&40QZ;wWN87&bRwMXkL@f4Oi zi7vCn^*(XbmH%>g{u@xkQ1&qYZsy;^oc9sc1K5p&*pEXPVzZxSuZ#P%aY+?$NfqHD zB=fjbqq4D~p`kozUiU*oMslFZInXq>M^{)`{lWWO>B^_UosWH=$07c;sK+T++|7l! zn~UNWlKHrKpY`Phz1tr&85EUPDeiWHu61gz(T>qw;UlitY74Q|VlQujL_oY*P<#0( zF8h6!<669|T6Y06Q4{XF1`k={$+p1#ROk$R29Za}lYbnI`fAzsZKW-cjF zrnn@oxq|zbCGl3NlHiDTa6Rg)$7b7kg^ROqF5=wJeYFlUWl>(A7molA^G*UdVik3i OZ~fdKWxd;cKJX9lPT|r3 diff --git a/target/classes/com/soft/line/controller/AppletCommonController.class b/target/classes/com/soft/line/controller/AppletCommonController.class deleted file mode 100644 index 3f510ee6debfdacc01503ecaeac72de57dec5f6d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2610 zcmcgt-BTM?6#rdFNC?Yki!HWRS`owNTBQ^P+orTtG*INrv5wB%BsZ{hvm1ABp!g)C z<40|0cv9Q(p}tfcrz6fdEojGAXZ$-zTb}$69M5h-LP*k~J~*4~J?Gx@`Mc+w{p+9K z{s7R2cLJ!#iE7lLzXm5U5Wp*V)sMjdhVYsnr)qE-XZ#2Sa2CUk#5q6CJL?4>UiaY* zhJ8Gl)P)>26A9Cp6xM zFigp%W*RobK-jcqRXb^E#%$c;39)Eem(_^ihONeVRGQY3%5w^8C?(BB%@Q#(TQ#H^ znmol&8SI#0@C=(V3avg&0ga^+5n)Yn^2X2zh>{#udDc3F@}o z$)nrLo9kCM@85cO^V0`kf4=$q-M{ZIXMR3RDwx8wf>zLAAaBc?8@Dq~HrKDG?|hs7 zZdF0AbEp;$vS<#4GX2lckT1E5k$Dl73>}3=9y1LogHpZVj*LtJPt)|ElJw1SdrDj( z}6`HrGkA-<5Jw3eLj(tOYT&rC>!%=WycFO zux7}a%vht*J;LzOlaH;DVo-{A_AsPyls=C2^s%Io;}k2cO~h5vx{p>5tyIVKeu_Ai zRz|D0^B&kQL{#7ay&YlTAU%MR5kL!`CXQMZhe^s&?jz2T3v~X9iVajUtP!`XfG;jtLxB7WTS_)K=L3-AV~k>EW6N6`#lc+Jx=O2 z>Ey_^JlUQngGBb02S#}UU}}qjnI>Rn2$**Xm`eoA`vlAflmP#qfl>bpFco-_(5%35 S7wIOVULyWw0xVNgeg6WMzrWc4 diff --git a/target/classes/com/soft/line/controller/AppletContractController.class b/target/classes/com/soft/line/controller/AppletContractController.class deleted file mode 100644 index 26ef06e13e0c9e2e927ece9b1fad1366bea1b37e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4162 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 Lz*fl)dB=YN9tJLj diff --git a/target/classes/com/soft/line/controller/CodeDetailController.class b/target/classes/com/soft/line/controller/CodeDetailController.class deleted file mode 100644 index 1393e62af2dfadf62f77985bb9313565fff7d6c2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1948 zcmbtVTW=dh6#mAsjTv|0%9^h%bo;VZMyUWaM zLWFog2m}%c2?_DS1BjPCArMFukoW=o4${k?K%Ci49NVO!2wR#nbA0aSe8+$M_3Q5d zrtwM%1DGB}0nZKLES@jn99}5m#S$v0I`&IN%rNu?QIlb$7U?E8!SeJfuSLzK)D?yU ze$QQuayASjE3Aq_ z!*DKh7;6r#Yp;~fET)hs zEk=p<<$`hm7jjvTYtqk7ghacR1|HhxceS7=s_wI$= z-HJmKPN3O_R>i|G_IntDSHyV_7cg7IoQHW_WH{ZuSN;W%MZD}`0hc@sqC^1M0pOMT zs`M?x$!>f1+*71%WI!sNkUqXEqEaVqm{66<-9GjJIYZGTzAp_yw`*Ty;r_>cG1|MV z7qX2>qfA>W+uwxG&LrjoVGOzH)vREG{t5;N9620u#Y}J1Auv2Z_kN=Li1rbs=Fxe8 zUYsZ+TA2D7><7B!FhZvj1`gvvI-LO$z(E`$%7{BkFQ+_5(mA60rhY>1)Gz4E;U@Cm z6Q|S4L~7-5Cb?yWbTEc-vUY@|3ydDXL#g7?G};-8^I`h=5raqZn7h0Ib|Fpim?3H6 zkKysxaU3TMp1?_iNtCz545o03Y~sRGHK5tS5-+K7%8Lo9O=$MVC44H9E7* a4^p&e=#`@ax#A7e?J1IY+Ta;H3;Ycdz%9T4 diff --git a/target/classes/com/soft/line/controller/CommonController.class b/target/classes/com/soft/line/controller/CommonController.class deleted file mode 100644 index f33e0b437395cb1e1a02a8158d189383b03d52e2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3530 zcmcImYfltc7=918g=IjcMZEQ*l?qs$UZ`53C}6R+i&~(x)n1&PJuHK>Gvmw|C~2Db zp&v?8wXwIv*e14V^i$KjVp@Mde}^FaiKfq)**mio(iD<8bI!i+^FHtO%wK=sy+=gd zG!v%{G}=H4jWyEiG#;ln=uNqOtC7yoS^4&MBfUfK%ExcF(Ixu34Tsq3ObQ zXH_k)p!WO1o-tgWlC+Y(5Vm!~ny~+s)Obsi4$#ZIiD_ccfGh zx^=yVWr#k6yrXlRQH=~45EBUFNk5b1?wE!s1-Z~Qb6j%`xz8Tfh)Dxs+grv|w=Drm zCU=p6Ovbhb^9Qilmgb_6n1NaOJ~r#X#*vQ1ls2uYre>wpQ6aO?Q=VF17^ceK*SRBe zmc<|8o^J|Z*Xwz(mX%nHHV$(!X{SzWGP#1gAm1=*q%BSOE(nPKMxZw|8Bk0Zp6D%$ z3rFFJ*`liK>BB#x_Jm=p-i#(Iyr{lBwcjyLIou7(6LPiFn(2e))}_n07p{D{_|3KZ zckV4*{6jh&b_AoYRj^KE9MjMZ5xDOGuyd`#kgc&0GDO(r7kpXs)o6K!eM%Ern7+C& zWeBMw;~O5D<@Q5HyGollpU;wR zKCot+r@=8-+OXP$3hg(|uuV}S`#RQFg~|2Eud!$fGb39x^=deAz;8>o9_B7CUY}e1 zWN!KD4+|fEwRGbaqc~g{vmH4z7@hkcc;%*1o|VX1D`B;Kd;o3&auW+F~I!w7%&I2`tK>7L69PUSLONzp) z3P8D@$pf{Of5#1lA5*w0(8J-U9ngvsFlcI?hY*!(_RvmzC2qjwQ;QNpA>ge_79cTt z81HphTZ1#y--?d(<_aj{-@>%COdU-6r-^0R0%A(hx!DaXgh!0MvG2 z$LI;#4SG^}0OYE$Hh29>ReR^Dx{B^l&5t;#q5{hP0A+J1nMHvPwbPS8+XLxZga=DU zpx7CB+DFyYg`f9&^c3xrFK3AzrTwt1dXUC>J3W1do}p(wdXBn1dY%qs#XLGlhk&I> z*Io!g+OZs_9-vC%2eFe5Hi3BUJk_x%-rYssH)VN;6ng`TZSbgI^2Hq8J|G{7v=p1C z`bbNMD_S}lVW~f7X#kc6D_LrYv~+Y`mX75ty#z}`k(T1~)EH@LsG_Cg5k9?~vvh*$ z>6LtS?u1?W*U+Nep{8G`Sym`3s;zCv!K*l{qC|kY9SI(W#7U1%(P{kf8aA?YJR122 DQ+eZN diff --git a/target/classes/com/soft/line/controller/ContractInfoController.class b/target/classes/com/soft/line/controller/ContractInfoController.class deleted file mode 100644 index 6e491c6330fe702d590922e13f84139bad6b2fe5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5893 zcmb_g`Fj-Q9sf+O-E4*smP0u#pd1MS1}UJDG#IXuHk?6P&?=MN$!1`)v(C&y($-3= zltZqz6a^8eO3_vXtA+%k^rp4<{SRaV{?vb2>%LU4!&BB+4x!ozK&-?_y(R8PkY4Wn?Zalgy-5 zi|LrHaicMjuw30Wt%RfCVNYq&HWRTnTkkM-TlP+^)zA};)<(6K-KFWd4O(N$wRW4f z5vABM5i4q}G+f<`=M1a4qhSTC++S92CQP@1?pN1rQBbmi;uMT-rbFve9j%7FS*NuU zmxvzUqT8l;&k#%8c9Z5mSfEd$WyRx$ori_QMUts^T+DDAk5653r1(eNDAyIzoWxSY%-iw+@;jw4m~NX&zGTKLbK(!zAKsaU~xWc zz4sc|6EUsD72&A!QP#KaFd}YU0~J-RHQaV9xqkd!07|&WBb#` z4$&7@kwNf7noK&@3STOtMw~&(>QJDj_n-UtyfrKW<}vdTZ*GzCGSZXJtWv_#ov{LO-m!5_0` z({V}i_+;l26y|bhw{9m`jcXkqIsP6b*6T+Q=Y~2Sa6H%o_>oBOOMU6R=d&TM$|b4h z1x>+{JEBwADl$QkMNdO3jn4eAFD>Y7pB_{v$urKV6Q@hiHoP|lo|xef&+JpMy+Gv% zo9U;9)MuDPaNpG-5cK?~>GcsF^75n%wOA=TVu+MhFge?0M2*U4dBV*Xsi9!XFujfF zRzwXaVw>_P6JeB1ZQ#iH^wHPuG!zWg-ZL>9Y*Q5)i&sB`iZysk#bvycYpw(PkEIWu4d5p#-o<+=-bc5JE9g;h zuV_D~-?;g54_mh9WBS6(8cdf~mLOzmmT2!oZ8?2Tq^u z?>T(yxepp{UfVx#@l}tc;-~l-H4j|5mOgmS)2!m>lGcCy?SbRH9*w&Ddk*&Zof|l@ zum4)NC#k>Z>diN=2Jj0NzeG1rq$lUsJ~6*~nORfa8Fy-CsQ49r&8p2Kch<~Mu-q?f z;9Ot2@94+JPu{w8>EC^aZe6P^PUMR9>l@`Zm9ST ze#_!j@ezJUWrdwY#qaS4mfzqYBRYeMKjKfhde8d(XZ%IQU-35uEPVe!DqGQTb65a> zSMd-0Q$;Q2=2_v5Iy_AV4PbgHsL9tb%*e}@Tu`@}#vU`>_Ef8uWNx+_aUSs620n`N zVMP?kA71h~eJxTy)jcAZ!RLWAxs5C^o%cGzAY2|v`q$_${^zno|&;uR18)+Bg$`ng$E4@Dr{ef`g2=eX+9s z@~WB9DkcsR@xlI+E1%m)M4U*)+;;h~$Q%oqJlJj5n{x6(D#sjg;#X1uKl7NyD?PU9 z{>ZbXyAUy3U}6FI{#lVhyUa##w5`+`BWqhNU-_xxs3M(lEyY)KnwDn=P9p?$)WMC@LoFS z3Y2%`mL`_^I5u1Sh^1Db7*cTv~(jjp+v^Ghp`lvZk3jHBUsyw@?M0B zaRwD({`Ek;Oxh^^D!VcIB&k*5sth%F17kBTj-iWT;bP`}EZ@iFxjYNyR8)^~OpGZ^ zgE@@a9kjGfkk(augWin~kC)!{VuFHo^TPLZ|35{#lD8)?`k7UpJ*rN=Yr%RHL9fCe{U8=CPrSDxV0lW50NaIjrs zw#IWJhglanSWLn(a({)+k3}2zJVkdG5bN#Gsi%QSD@wJLa_6Cyt7WoiMM8R9ksQ}D za)}6xN3r@JOba0T3FZc11klE38IkfLY6bP(7L}NYO3W9PcA1sjpui-%h{+D@%=DgT zsJ?`>F`0ClS;Sb(?ZGV3#Ju)X$vY^qf+$o`gvgsY-liM|V=`q#L5QP+LM!N>@Vq$Z zrC9Sy%Ug?Z?NQ32Wui&N`STi8qA<}c;gaQZDLLqpNHidbr*pk{x{L+ohG+Mn`d!or mSNPG)tJjb3qj@&piWpLn(vxY3OOBL-UD(YBuQzrwp7<~JZKl%z diff --git a/target/classes/com/soft/line/controller/LoginController.class b/target/classes/com/soft/line/controller/LoginController.class deleted file mode 100644 index 0951445f3a3e5966373db0ea91b371deb2c7e9b7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2653 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 diff --git a/target/classes/com/soft/line/controller/MpLoginController.class b/target/classes/com/soft/line/controller/MpLoginController.class deleted file mode 100644 index 8bf99f813877c88adaf7ce6eaca15ca806970389..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2433 zcmcIlZFAd15Pr^%f03C@|mfTeiDv2aee%${D@y5b~Xos9V0L1K)L3AUAt) z=o}dOV$tUm)k0gTul%8uH7>rO^`!VfrTu{ zwM_arqcU!;^AH>EX_jneBzB*S59Vvcr&!Zws8MX5TaqR7=-P&CXVo zf#Fm|xhO|b7EC8I-Ak3J9L&n(erd;#f|h#fnC4m-YmjMNr2S$TNg=DLMov@$i`nNVO=W=xX>Z9?n4+e5 zm%kYne?xNoW2(Tx#N8~{OI(3hFh8O*XUr_+Wu8l}f@@*y%di z0^Z;r{Jx57D8$Aukmr5i^7609-JZ{%U?zt@Q8>YD4nOlCpK^91cDB$rNSx6WZ{jUF zeS7eb(Y!;=b!rNN8!$+NYcUSZgm{DhOD`ZoyoZ}SE1DQ?@k5yUC*Z!Ni2+xR!JVKu z4ylrYR31PoqdEe~Xi|`>^m;m^dO3Z%JlNDt2d=^jgP zo#|oWhFOvm3itjfBz7vxWhl8qAA)Pi6z&8i5mPD6%X*Bc&&yI$H$(d@H}2El3bi?` S#sKE|^?>__^xkLBqkjOicQu6o diff --git a/target/classes/com/soft/line/controller/RoleInfoController.class b/target/classes/com/soft/line/controller/RoleInfoController.class deleted file mode 100644 index 40b63b1221f9afd0b4cf80f8ef069c931f997d99..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3359 zcmb7G`*Raj6#h1SBu%%p1ZaUG$h)P|6$JrX(NaLGDU=o}g0IcyHr=w>4ZE9``ULUO zGV&M)MI2O6u{e&3;LsLD_(^B{JDRlq*1ghh864?wqXp`2Im3G%uol=rFim%!@+;iZml4AP_Xnh-7I!>-(gj z5s5IfNkFA(Xsk`|F}j%9uPRKy>Y!poCClisB~8_tWVstsXRadIF6fNwwi;#Ks-=cB z)}rf%E!(Q0TLLz@!D6PWM|w;-$_5PcpcG=VZb?0|VjJe5Bxekymbh&Us3r?@NO1}| zBS?F570I@=S=Cj03#D9F-z}iH)d*8cl|f2mXFM8W<{p`lI<-(_ty?x#{+<#R+r275 zUz=9|#n5f4lE%zT4O%lIidi0Ec8jL9Gd)h$&2_;(xnGvzwyH_(a;&L7&z-Zu4l69i zOC_}$(Ws$!GApjxp6OyfkL$_x_UIP>>`8EF^_gJ)F&t4#Tpk zm@%G@fRcV$ixbFFiL;lGuMDb&WDUri)LCYh)Dly7#hB@^k__ihog7V^`Xo7gBzb;# zYUHD-;j4+Evr`u@3s{y*=1g63SUq#Vo$OGYS@u>VJVH*_osYUblI|UkStP^7AJ0fp7`O@jApY!J?%7zzsrc53frM_ zNHyu^o+fr9XP|&Z_oyr-Rvu=SVyX_636~oudGb=?)Yo^L0fmm2=xKS+pe_Rdo?{s28ye%e^o~Sg^f_i|EIIh{G7nlrlMVI&u6PU;9R zUK8;;-Vgv0Z{jV^9hWbsPfU(nnHW1Ub?oNE*p12WZg6*R3-G960kfUHb-J%jw;9oq zI&E6!cBF_SI4WRXw!_5eRXV4{`O6~Sad0I^e@z^};NlXo3ah<1CgNSZNA$O7%+jd| z>u6X_{d6hiXY?wOdh*QWJcy+^xw*52dNJ4AU9JyG-y(J^d~$N~@#)EDzJPUklP5Jm zBdXmS4@ogO!g`rTJuP+6lA91+>T_e>W5f#ZT5&~T7EO&OQ<0qGN{z<*8(^hwU() zLhm$G=ywfiNc5x`fs!?&5Po({8t9ih0OsN$`W0OTtVJWe31spxN*v=o6x2hqS!;fQ zr(qmL9*m**3Q3AE?Pam!rP|d@c_ACD!z1MF(M$v`Sx=G;Bq^ajqQ_(O--C@#PBpaJ zMBAGWK(O#Qn)up6GoBzNFVA8NEvPFp@b;4hhgX$?SK>jSGzXyH*+o&8zRS~`*&DpMILrUvU%t<95pycQ9aJS_+;$iy7SLNc#S)vnk%+(wjB#Trmcm0L~~+fMXor?mFbv4-ead+GE}(b=8F zW?ZE6ny&9iroJP0)R#+meYcTsFG^~?^$Qzk#)wR@x91kyhaDNVFD1|XUs+($7#_HW n#hmd%7FTD}Sv*ZL51w&IS4&K8BaLS*Jcl4{w9|{rz@7gAxTCC) diff --git a/target/classes/com/soft/line/controller/StatisticsController.class b/target/classes/com/soft/line/controller/StatisticsController.class deleted file mode 100644 index 7eb548ab180a939cfdbdf0e78644dbb11ed64001..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3322 zcmcImZBrCS5bix*j+X@m1A?LnL=-Tv8bJwnVgQ4AIfMWqQ4^EBz2RKE+qvxSLHL$b zQtAhTCRM3?Ny=zS%TH=5Rz*Tpen5UlIN?vE^33kR?QQOiR1vDKXLhFN>8E?Td-(J3 z-~S+@UW!&xExlPu)$~?1y-n{_QG~|C?5q&uLQDwpt`L(#Oa*DWir%9cap?UZeIQXu zg2yGQk8m@tSc%!*IVHm5ab|`js)-7AttSM&B>l%}&GotaNV)0p9N$3VsEO$eh z@~h%}^JLnv^(33oEj^lGLx#bH7B?)3`dx!5Q#azXrkZ36+`OzrnQBxOO*f_g{ij6|g)JO*MrBA|0Nos2SbT7@;oCrwSvsHQHyvx}wn zB^~A!pBoxCY?CJv%=CCNvbhMW4Y^>9a?{xYO^L!CkvVl&Om#-RjKNG4E2Xhh4kY{B)I>$6S zGzddG$C!PI$0k$}Y@3+~LgkbmH&i=qB3MzM8_$WmHD}u+I#;X(RpgiFb}eNnrH`kW z=_CiZmd&e)G)T!$S8lC6xV?Jw+Um{gSVsOZ@a`*^I}0qTM0F$P0ahlsW#dj#A}kVB zDb6+H+5pm)pPZX<$;;B`w=~H^Y{I$ida+$Ln9-U;qBT8xl7>61C?X!>suEUCt&T zv*0f3fy__KnXeyYfv;V8y7E=#*4?#-cUG6Kz+mRPN9$K_NVMN?#E(WqpQeI_scWf=Yn%tmdK3`eC`px>CA2UneuHC+#x%UI^!^0xa zAYvM0sY2Epyn*&WHF%(MMf#gJLLyL#j2VhyxV5oA*{R|nNfE zU6AQR`beg3Ixo`^A&v=gT!?>;+rr=TAB{x34S z{qORq`#7R|$C>Ru)o1`-<0A>xvS8bPGDNL-^=t93LxA>(SUNLYA4#+e^Ky(YV64Q5 zn}ytsF9oB7v8?Mil77J?KuwTBnV{YbDZ2^)-HR`zHSMD^=kPSN16Zr=dQ5@C%TyAe zCsg_fDgBBg4 z4k0?BeDDHE7Io2KXa%v18jg9u*vq zdN{u7=Xk6r$6!H@J=@N)S8(k0aP0GQJYJMzML~|e|3AkQevbY08d6sj+zDi-sI3}N zGs{#dZIq0+@CF=;Zduf1OGebNrv?T@Tn0RG2>~`-%uH25GeiGv=AA7_sOyy@82az@v1A=pO}b BI0OIy diff --git a/target/classes/com/soft/line/controller/UserInfoController.class b/target/classes/com/soft/line/controller/UserInfoController.class deleted file mode 100644 index f61e37f2456f232de5a495a9d820991de4655186..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4423 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 D>XfMQ diff --git a/target/classes/com/soft/line/entity/AppletCertificate.class b/target/classes/com/soft/line/entity/AppletCertificate.class deleted file mode 100644 index 20b443f0a95ece4168a6baba96b1645bd6570b17..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8283 zcmc&(d3;<|6+U+|%bS@unaL!R&E z3%0l;?xG?ng8N2YqAWsKWl>qgT>%voL2*O<`L{op`kj04ym>QyEmQuHADnmYJ>U86 zd*_^c?w#=1fA7AJh+a;AkI|`gXOxn37mK@D+{5Bt7T;oVAB+20Jiy{X7T;#^9TwkZ z@lb>wj^X(Ti$|IAd#pXi;`=Oqz~YB2e#GL(EPle`r!0QP;^!q?5&&l$d@M7dj=6{0L+>4 zWMTLIt@#Rw!J~%TL4edv=8Kz(Q-V66 zGhc!G>7GcidA0nyx$8%lyo)d}VtM#lj_3p2!t<&c)qT|o6LKg?>gv-p$^sE5Mt!i36CXeuu& zG_!n#dgX=^j>66!T*V!A7`Kk&8lsA@U zGZ(=CHNz2sHddFvggc{B$gh63&SIC+eG*x}rcUJuVS<*UCFlh9gijf%o@&LI-e^du640IZx=VP z;T0DO66N}ytWAPKWoJ5HL9gJAG{BwRkTX(^%SrC1ycyn5fX-PB zpe9n1p{~!iDNNm5jYlQdvyh&UJf60kR4kquQ$pN+m{0(B9F^vh+-EUmQ-d~XsBfET z1*o4)dVs1*QeK#vQt_-dS{={o(2@)o`P5R6;_^2p#?h(wj^$=$CE?m2PibQ!SK7!` zfs9V)=B8C!MUNdp(zk9K8QX}efF7>o=jMxO@GUask%4M{qf%3;RJzKVIZ&4!Wm1WV z4R}Is47lM94X9`)2I_+r*JBl($Urp|8P3mQhdXzP; zY0~HE?IvAFuQlmyti6sdGU;L#uV--yiyVtxG-1*ti#!i^vzX%HG;0OgW6~Gsi-Njp zcP#bY>*ou_N#3rRL%w)&VkS|Y;oM@3*HPJp-X--z@(YVtVbbk%5sr-7 zm#bEVLe0(2Vr^WU{LTx{(Nh;HzG!*z)t-1*JROVc@~OBECMdwA11-SS1NlnmVG?u( zo;Ln7NVJn21-P^{B8ev>Rs*?agw{%EI|URJ(lrFQ7GHuFiuWaWq1s=97q*A?>cI1C zeAh-iH_g#G^r|@;@x*~`0p3YRg~z7T_&DO_hK9qNkl}Tw0=zdh_HbFi#sv%KDTQbK zn+AAC%Xh@4hV^`@Z=++NqfbCyfSD|w0?*LOJ4oCjAv+*>L83Ih8q!n%dJXNwNbrV- ztarYR0yo1Lpqg{W*BL#+$GN4^x!czny~W2l*y!Bn>x`b{;~Z*q?)P;@FY|E@H#!ga zI->{rI7b?tm-{-ScltORjm|^9&gi*5&e2BalYE`gt9_hfjn1d~I-|$?IL8~EPxE!g z+2G@BHaef->x?tS$2rmHJnZX?vj|1pSlg|Q&TD*})&AOxwTm>PNo+g=*caiIgSS(_ ze|vQ*gx+4f^|%WQD#0%#FyO6SrddDAmS!orp}Ul)NyY@(JKl4ok|4KV_&{ zNOSxWBzQLa| z+AJj>OfKbSNx9Ge!(+`-^4aB5o+~N$`%}i7rQ{>dr5u%%m-~OX*({|x6ZP&Hlaz1t zf6GL(lzfo7Z@EQMzKPyUEwWLJBJ=JZZ)M6B&nc*m&_nmQI+Nc5v^rkHxO#7^Epi?f zIUmLVy%m$VU90kHc^1zlID`)luDp>#!G*yGDR~2hS{4Q$pyb%l%0)`aA(XZ)LlAaw z)gu(Qf)7*M0Ww!v!9_|}5$$#ekajz4g%}fln9>I*VTG))2h?Fl0P3&}E5aZ{gCdsU z0cGqcKp8t`MHv*+pr{q|fI96sK%KT}#TjI35Ht^{%T55)Ww%-h2DNHX!fN$^y6q%D z-FC`KGAN}%Nh{?6S#}#hmYufR7?jqaHY@D`_1NtI_1GO&JA*njsNL%DfO_o=K)rUS zm0?h)24$>H52(-X0;tdKwz?S9twCK@w+FPuwg6gU_gEH#dNjzgdOV<|b}v9n?LMoQ zL46w3YxPw@!3Do669cL=swas!NLSE1P(B&)0$qvATYv_{)AUZvwa`lO1icGdkj@cz z(z~IBXiVHn?|~MkqPT|M3oSwwaTUD}nn72K61^Wl#v zp_%kF-s3~i67-x{N*{*Sio4`Nx*A$igz2C35ojrK96d$XKx-3&^f+A$EiE?V*U(3y zwTrEE6MYO?hbV*NI%pX&k2m=^v`%p??WOCXb%`7Blkx^=-Qq6VM4y0WiTm+$_mj|i z#54GH^C@V(;(6+&PebdY&meZ!)5?hPZ)%OuXa7T;5&9hdHN=0YTdC3ipISZkuRsF` z@(*ma@$m}_|04o#9^xI(>Gxi>y-g-mO+ONPB|g~gTUW}yh2Pnj!UZR^0E!e^$wX>+ zb#RSr7=5YXX|xL?HF$s`s}|{)OL)HB4zj@tYKy^5M43A5kTjuxNGHPzRZST?EKOn8 zgs!5zI_-!wp`mE6NY&J38`5OBCbSvl)on+m2^~gzMXM&uj!9F@HKFe)uO2%tO=vmV zD_%AA+NLy_uF0&L`s{=>p$BQNMAfv!Zk481*M!cb)>>*Or3p<*dnKi*&v&~bxib7Z zUoGMi`V!rU(Q|Oz}TE!@J z(QVL@yjfbXkq%-ah|MAdHV6rHmKM)Az!Mn?RRL8@uzpIz!X8)+**L4gk$P|q?_FMpeMjQTm&d=G2Z?yx{GCvBZh8`}f&Vr1Ygce=_t%I;HU!wD(U-3%Ugg KT9gOd9sdLQ;b5`= diff --git a/target/classes/com/soft/line/entity/AppletContract.class b/target/classes/com/soft/line/entity/AppletContract.class deleted file mode 100644 index 2c9b6abc0122531b792e43d812ee741862cfc0b9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10500 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 oZl6ePR(LJR{#J2 diff --git a/target/classes/com/soft/line/entity/AttachmentInfo.class b/target/classes/com/soft/line/entity/AttachmentInfo.class deleted file mode 100644 index f73f27071d6f0ffb469f63a65144d97d207d8a49..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2305 zcma)-ZC4XV6vyubl7+Y-2?!P+TCK$rXxM7&vtm<}8cV3BP~H#8LI#sv&hF47ej(rL zIilzEMc;akA4>bbvvHGbmxFmRcOL#T_c!<6*?jo;&%Z?UGyR^YQ*?iv^0ds&gFO90 zHSYb&%?dXUxp~CRsztw9^jJ_vwFFJA?a9BT(~;h;Q}?vH>jrlPO-QX}v)y$)y)L`1 zpveK*h7Ods3ss@7`YY%Nvb%mu?HoRJgV6T`<)h)I;sZ+20S8)joQG1o*gpH`fv2&! zr9!pcaciFEYpIp*g@USUO~32x$WXh%^KQr4lg(#1)RD2sd4ln(A9SV0S=K&S+zdtIWw6r4IOHxicmF%>Y)hH@Ju1rL`5?B8F{cw3h}l`G}VLc zYZ%qSQJW^C7W7dshq)-dm@=LGhJO$=-BrcOoa%>xQ?tYm!KU+c!6usuHce2`qPk5_ zsA5xziZ+$GnWQP3&T{V@6$D-8LOmhth*|%Y{jt60Huca{6mqV~Ky~R79_cB(Yl|`r zf?kGMj0J|VATbs&B^wXF@tdUxhS_J}8X}ps+3=+tKAWVkf_~{3dM>Rmr7s!!tEu$4B>mM?`fDfB=aTf-L4V^IdVUaJN?$hgKjDw_ z|J7_I>2IgfUk6A^HCv1vy@jY;?xUKQ2at1dx#ajm0)SpUOd6(}sSzDZGSyOZwe3(qH{}lBofv^<$X$>lHJdGfa0)nD6}u D95!c$ diff --git a/target/classes/com/soft/line/entity/ButtonInfo.class b/target/classes/com/soft/line/entity/ButtonInfo.class deleted file mode 100644 index cc9f8196bc608ce2cfd22913faf72be5b638e57f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1011 zcmaix%TC)s6o&t?6DM&T0s%tHEd(}!O7(_aD;7nnR4JuMAofl&2}X&HoCy+d1yU=d zF8TmGRMmg%$S$c-H|NZ`e`n6~@1MT_9OJ--g`EnD*wvz?#a;>R67~hky_r&B@MR#- z=-zmDo;&t}k$a&cKNx)wu#@1lMszBj(|B468cXF*;2Q-OB3A5Pq9I8^SKb*>DQukPJX2~#i(Nl+b0HFpql zt#g=%S)Kl!wBGqQM>8&emFhYioO==1Q8FSyE$yDHSW6qt?KGZjoy8N|z6fVgUw-!W zs`U)~z5YuFRX7exC_AWVVWTY2`p?ef%ntFbcO&}>ZQjh{HBA`09bbm-7;84AE`eVK zhq6Y?r54o1qbG>RIBkj2ik&9veCt#uU>Pgayc1R_UlxCd@xY*gtk}*iUc)-Gbnywb zL2Vtq`vD^xZO7gv4y?x=nn~7tyhhV|2{c(-6f`u`MlO@N$kfPXdXvv&E;2RAwDAg) q{^OLX5;MKcWhyK(ZRRp<<}(!*nRdz4dWA{fJ7uzCrY%YX+kXIQOqxRg diff --git a/target/classes/com/soft/line/entity/CertificateInfo.class b/target/classes/com/soft/line/entity/CertificateInfo.class deleted file mode 100644 index c4d9773865ae15143010db1eb32142845ddf1aef..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8523 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 KlOXZYQ~v=wIx~U* diff --git a/target/classes/com/soft/line/entity/CodeDetail.class b/target/classes/com/soft/line/entity/CodeDetail.class deleted file mode 100644 index 63c8c692a053b285f318afb69012dc2755093a0e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2489 zcma)-NpI6Y6vy8K~5zhvN)X+gayMc9%hqXPtSRE6*KVC|t5#gosXB zCCi;+5K0ZLVRRZ-WDsAlN_=UjnB~r@nJoxdJ7*TwOvj>eB^Y)$tZfE^3pu-JY}*f9 zqkwq^(pv7WK~t4?g3Gn%xl4ia)_YS!9;n*p+qb=UFo`_$AWtTJ*@oTUbl7=FF4K_&9 zU_?XBa?N&mErs zA`Ie}qT?491BFQNNg)W~kwbVy5guuTM%&a zjf!9h4&$?47QhiWiX#TcU;wQ@`5h>4q~yiG*aS1>1$&U^uty#h7!9zuJd z5Jd=xLKA{}Sm^s=vSc}-LPA@iQZP7y+I~>xRXF(DGk^bwi31O0#ikY2q>3{9J21tAm#E<- Q=#SHKMU#U5lGyy^e_-!h2LJ#7 diff --git a/target/classes/com/soft/line/entity/ContractInfo.class b/target/classes/com/soft/line/entity/ContractInfo.class deleted file mode 100644 index 4997bc13a3faceb2d9ed10c9a6be016c07aa9149..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 11736 zcmdT~dz@Rvbv~ojIEvHgPryHtlRW*mSb# zV$;p0hmFZ*1&j6uL|=%`7yX79;NO*O1`RP}h+#vF7$RwiRfagv5a%0WwIS9RB4vnC zLyQ?>tsyQjMA{JR3~?dz*0W-NK)gkeCpRUief-AE&6)IUCO@6to-b#ov&9X9d{f!^ z?eHcX-d*KlEsC{Dhz$XR%gzY`jpMPS51_WQ+MsIcs;cP^{_acs4&>oKY-zwFBW*r!(|NT?8dnQMp;modINKr@=SVD zZhA|0GB=mu5eS~V?fB_C?>qhJhXi$2aBXjW^O<6KqoB4^M~<90dfTbbzi{f8>QTIemAC=pqP68g>r5-y#*tVCy(g1 z4t?h2gOA{CIg7PztsS2%%%%5cO66>E-`s5a#?0hRr9$2@G1FI~ysc2g`0}ip&y*3G z$DG`c|0X7;@IDNl>$ep0=uC8DDVIs_n!#e3$>iYTer}waDpoqR{NNL(ZpZlQPN`yT zrv_Aiovzxa5AMlM=kolpJTsrWZTawBCl4*1KJ+xtOh>U+HjvFvY0jzR2TwlqNQL7p z)^X-D`{%Me%_1l7|H6smpTgW&e(oN$<1E&4yjbn%n1A`vJ5N6KICn_`6;%5mk-5TD zZtwn`*&+s6P)HTkd-Wq1Y@3}%%l1;_MamB>m*S}>k1s!b7ppspwH@(IXUn`^I#;i8 zWT|Qn^KM4I!TcQ0<+D2$=CERSXOONqsTC$OvsY(|IWFr;Z+Rw%{52wHOsTN9oSp?Q zjls#4_op}Obg@0Zw}5$Kpy@3tLw3}(UdfSdh_Fd2$1n%Uk9*t-xZAnNdu)-$WiDxI z726PtE)0cTl{J#E>CRPRhv?}E!lvr93Zb~wo-bV3X-|Xz3P`g&a6m}eju#lM)TnnD zM0tyTjm`&FZ_-y%@26|E%j;QlHJ0{7wmegq+L+hLF0E zMU6eOfHfm)YL)tdWhHJ5jdOyuArCETt3%ta`PGqSrX8cl77XXuqF5bU*@j+Z0TlGu z0@aOerACh}%9XJNwjWuItv~yLh0H7ltY(znwdcm{WO>7y>ja5H?dGjr*kuaknJn^E zfaiNM$N5dxNEnipdhZXbdR>Z3*JRDMnNSh6l}f|j%T$Ce#iT~f_7+zGHFa7+y&2sL zy^&R2{HC|*VERI{n>J*vv+t}=GZ ziOjrAkT~heGovw?$#3Pkhj}xTDb1)H+p>Dic1*3ES8bozin#~uFJ?;%v)EW#ct1w6@-7T0=ym5ys$q^MYezGz z%W5P8=%d<_s-09rVU!Ch0pYnW&E<3D%kf;RkqE?kXOgnF9!I*i3o!>rD%}*{N(XLO-B?$EN5UkJY)U%Oc_;aWR`qu;j)Db)Nrf#uP`j zns|GIY*-=s9c-W>eEDC254JdYcp3tEcqYPb0q(%>RuZ(WMDL(?0&FkQmGsl_L`k$$ zwaUXYSCfXR#U@SI5j*Hz@b27B?`Dasq(nb?suDW@YePJ|4$i$FST~KNtL=VV)7bfI z5RP@GNsi86Ym=_4>Dl#-oxiTG^VdTRtF}?{XKl&%)kwa-QSyCtlJAEYazLZx9$Rvf zrr^z%XfI8dXr}Q&C*ej0X_UCpmbj^=SF?@1x~Z;Lvk*f*YLv{|l7+MNssJ*wS);@U zY>DF8B#Iy-7itN|oGsfD3yq_(fN}jvoG;-NRcOdw46Yh8(gp>@PqfjbDLZU+QTRPe{$%Vg0hQ zgYE#1r~vv!`X!VECv@0)vZtQh<4VRx;6iSxC-=LOv4Oadz4hcFS28vp7qYLOe4Z;A z8%Ur!!&C1ay=AqVQo>s-m$AYI5tJ^5l+GB#Ehae3Yn2j!Vf$+$FuuO7c;nBDqUS{yP1J z+k^X>mE?m)MRK>4{Iq*7{mn}9F{C2-9x3^o?vjCKCHWXqk$kU|e3U-p_TWadl6(xQ zNZueNA9L?zuvtkymQ*BjQu45SFGI~r^0A~MIVU9_cb5z|E6K-{isZbM{H*(fN1B!7 zV@pM{BqcxRE*WiBk`FZ%$(yC*Z@EjhHY>>oor>gsDS5Ku*cNOyP!O_%XAYaRo z(JxbCVl1^p?Xn2av11Iz@~-_Vg-!2E6hBOnwWfE8I_-!q%ZHFI%WwKP#{Uu}4pY?h znSMu5w-rE8w`G_C4l;C5z%(2|JysAwJyysJa!^PI1v5RW;X}*=%8-1#}PDW znFt!RR+uIStYLBrO7+0Q`(I;h_qa0HE5 zD-kqe4Vo)CXix{OGzT3)Noxo}No&{~;-Fz2G-M7tf>v202wG(&%@Gbt>Yx!bX$N_a zV25w1KM#nqny&VFz;lqEq%UHAcY1E6r|`w#p`@okPou7dQl1DP?G)v@8U(eBw)NstpWPhYt$8>zr;U7yhc3=2LFFR`{4K_ z5}}vx4)rnOZJ0wIK2vfA_8YMc zmwGRg3A8V^VFu~bh>aemz}h7`?*^{#vb^jtz1m}NQdO>Q%O_pPr;=otKHJq}`K8NW zaUshpmT3i~3kg=U0=8>~Wk{D%aUtz0R<9M5E@WKI3fitdDp6P<%+e+YL_mgam{L%u0GeagheS|wVoR-;_LJZeH#@~}Avy^Zg2KPiDWEX@2+Q?*KoQY}G|6p@yAvHK=z_;plxvDk&c0w*C}N7t)m4_9=O&knF- zytP$2%4>7g^ws|s%vp+&-H7OCo- zB}hv}-cYKlcJ??e7(JU{RkNv3Ez6sToL8W~!9O|cymHHFCR&TPH78!}`8g1D6S1b7 zsJ3!$9Nkd-TpFsjb*xR>#Ig>mj5O}s_ney+brVI1{G6BjGIlJO-9<8+@&yj9^L#y_Pn4)m$S z+Y}z*cuQfN;ZunX3a?^(Da;aGR)0UJZur!F|0{ay6#N%eH71Tf7Cb|j*MIKDTrU@Y zK>vY(#PLg9ir)kVbS4F|ykJa?Es`g-c9B|ArgxFNDbu%zKSY@RMchD|fkg_WOkhpxhmdKk(&@Ncmo7c2M32LLm3`*4sD>pCSj6O6d(Nn`tApi zSDg`^@xfPT{7~wDlhWIS!9JWlm)*0!{hv*L|M~Hgh^A;EMM=7qq;|T^!yO*(rsy6` z^K6EPS&i;%G^dbi6&31P-WI#UC<|xHSaPJfWqLCTC2Z5FEaA9)qavm2@U*+ZGcP^M z*@B~PyG3hrZ^iU{*HI`HF4rvER45w;RHRil9t&y0ePFfXNF1(PzO_*{7aYfxLRzll zD>SiOaBX8#_|o*=*kxl|6kg#{L)4s%r&uq#o-HKq(sqP|D`(xqZz7kQC^9kM|JHQ? zkY4aDVdP7wtt2c|HETJRMCGxO(RGE|9=Sz$WtJ_+d{(hHOm9s9iYs*sqP#9Vi`Ui7 zHd(SjITTR(?xr-#h%-#oBlnCP^m-UdO}4&?&L&#ZxZo`^A7A+ljEefDP!%WIuKBI>T66}_2I1PyoBsIu@h7s zbjmy=;>1l4o#FINJL#HF`1;+47>)0ru7!n8Jyndl4@0E#ZpAB@ixxjdPqVa>+^#yE zqye2$)S;8kLz+4@n%C(84eOMlPMxyUrO+krsAJv=O4q-D=NsE*K{joL;-Fj5@-_|P z14`mci<8RfF;kf!uz(0G@&^_Ogl57#3)=(FUZ47?-=`CZP`Cz+r*Lk-DzNdf@1%SQ zf=^>i1e+S2!CVg==q#PXN}=;~0b_IUS5iN>1W!i>57I@@aPSW=erxGmd)HOE#i!^1QwDE5gKcF_oixIz8DA_I^`*j0eS52}m?ozOf z!FPbvC5^`aB2F|4W|<=nc9S up}p2h|1pyOI^C#h-_)a8Yd?HKKkPRkCu)Kx_)h=;RYkJ_(@l&jP5lEJIyK|~ diff --git a/target/classes/com/soft/line/entity/MenuInfo.class b/target/classes/com/soft/line/entity/MenuInfo.class deleted file mode 100644 index 5e35f94d5a36ff7aa5df686a7f9c454c5caf4235..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7529 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 kZ7Vso?H9%iuTst ziu41|)u^wv7QJeaX!3SbrlXb?7-fv$OYH+lu)+k z1{zH+7d*$>5`mKbTc=`ei^6L}vP8qkdWQc+&v%5vUB-@3Fa=6_58q@yKUoBI7vKNR za{-W92y9`km62ar*vM?oc5Q|1JI2O0H0pfp6=Bu0Y`gM#)!CH(x&RcX<`qO`L-;oT z*Ec&=*#_m=kTUSLlvRPBC6SNXvsO{FJjw;GL`f>H*WlQAONpBGO$4>`p|O}_=E~-! zDtpBh;R{D1LqtvCP7cBMrr>|L?!i8XZFZ>#r;#1DX=~j;8(E`yp=+DrU@KzXjtMhs z3eCxjov=3HOwD7r5vbPxzQZuB6OduPmLch{hiKYxfb^PI^$T**=5}Nbi#x^RYSIZB zHYrWVOfp$ySaeg5LGva(q;Zq7)T_}5Pt%coLY14d|6+4n7F63-Em_P6CflJ=Je?HY zSb}s8jFrx@LyhpE20^G1oG?OIXQBIHIS|kw4Fz-@mKxJTp2WEYtwARyevtMxbUp={ z3^xrrjkQ@bpbWDI}#xh-sXX=PDy#&*%Bbc}o4JI>Wx*W^Y8D-jz zWx5j2)EQ;k1=E`&n0P80Oqq~rjK;AQ?Oh_u^gfnpf^z5uJC~ukcfAw2-(+a}WaPe6 z@_-VI*Fii%wKjgh0Df%2>ut2Lm!At*uEKVh^d*BP|G`ys{`Km4;!x7DI1D p=|9ENU#A;&`nJh4q80s&ite`{CmYB~e$)V{Gi5`jn~*w9{|7!)E!O}5 diff --git a/target/classes/com/soft/line/entity/UserInfo.class b/target/classes/com/soft/line/entity/UserInfo.class deleted file mode 100644 index 2f430db82ce54e1648e5393032479264b0d634a4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8115 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 diff --git a/target/classes/com/soft/line/entity/UserPermission.class b/target/classes/com/soft/line/entity/UserPermission.class deleted file mode 100644 index 53cc66dfa5edfd75358519b73a9a783e2a797054..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5054 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 Pz;ZtQL^tDU){l4(4&akx diff --git a/target/classes/com/soft/line/filter/ConfigurationFilter.class b/target/classes/com/soft/line/filter/ConfigurationFilter.class deleted file mode 100644 index 69771d90cc1f01c2dda1738b436ee98b593b3d26..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2104 zcmbVNZFAd15PmLpEJY|Um?k7Z3oWIw<0eO62n8o8jUlb6^Fo|>Cc~$*eRfoA$#XiV z?N@#gd~p~u@B{c!411Q7)~Pb%!86j{o_C*pcK2@e&%b~E4d5Xv4nD+v3lD5Obnq2c z9gN{?3y&P6%>FkHY$LyQ;2>|5H4E!DHq7#|jqhwcG0ROG^F|iT>w617SlD8)w_k60 zEiDy;Tl9UY3M~XKo)*>SK>EmP)mt&BLIfd5ipbqaTVF0>9xkyGm#;@T2f~hFK-UPT+@fGpN5NlM|`> zyz-fBDNs!wc9iEg8%nh0%Rv3YkG1ab+PNKnM(VZHuA;vRV5Z8tMuCKketazbEwS40Hf$rCcO1T`%os!e? zmFD8Yly6Gm6V{ZH?Lf<7=e)fu1G=IkYR8h-gcj5jG3ZIi_lN8WVNT0XN8bCg>4iG# z7nSjf#H&G|`Ab>lp;RX=srkFk19Gk!0$h*HZFD%N9CTGpQaEbMJazx_=~^-6W>}4l z6H~(>h`fuB@G-;s2#4_M!^1Fsc(Aqn$ih<>&rmd=Khg~`prf^fAs@$J#4<758}%;U zKA#DO<8v1!Y%|PUKCujAe96TQc4;{HbSWvr6Vd8Q7kl{0#Xia|4sghj88z@wl-=qJ zS<}?deqi4Vc9^{SPl&IGaRclXZnr%Ma>$%L&G1SR&hAfLTf%k-&c>PJZ7?WkZvqf~G z%FM?27$P=V?5esM{K-r)Tft4t(TB$Tl3?b<)B6+B9*|@t$CpmQey7D4uG8Cmg+LBT zaNMAk8yVqKd`220xLZi{0iKgIw$o=AJ4z@1K=KshrQC0{6+umr0VraMVos8aft!n5 z25^(4eU94%`$gaD4i-tKNY9XD$YO~s4BPu84O{yRsiRX^Z=x7$5Un?4?E(5QRt|Ru zSifSNR>0~RY{Hr-<<8(7Q5oLr!ObQA!sJmRJyq^uI+vbFzu!YTm;RuKYq?|(vv1{h z0~Vp&q0jCjt`Xy##Mdz9$kF%x?pyh;4j9>3!7@E;D9;3Wn3{cgv3rm71$rE^bf{+Y GVE+LoSvxua diff --git a/target/classes/com/soft/line/filter/GlobalApplicationContextHolder.class b/target/classes/com/soft/line/filter/GlobalApplicationContextHolder.class deleted file mode 100644 index 411089ce45a1b2aa580c7121783377e9e0c3a83f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1782 zcmbVM+fvg|6kVq+)P`~uP!tqFumvSty%m{3M)aYGBOTsPOIm_y(n(H5`6@3Dq7Qz6 zALY1C6Qs3_Gvy)sT(b9CYhRLIzkmD$u!<)JQg~qC3Kmi{rrs^~UY9b?o`?%;>ebS*tmANh;fOx59{=K=-=s+G;}} zp2_YDB(}T*OQ1h*yVmP^wP^VTS#)?al=n)~*_Xbp&(UQ<9om7wTE65}&A=-w(_x%h zwjE{p=1a#bN~fLmmFFB-KDkE%OSQiiSjlvnhn7Ah+wv0_*s;{1cko8)YETr__J*uc z380qnj*>CFLHvA1C<}RFxfTLx3ipiQ=UbW`AmaB4U z^rA0~>ljI+2kA7%a3hJwY23uPHn-E5#XXMuCB7a`_W8JkO(9TcU;pN@)E!>vEDCq{ zH%dXkXgo}e|EwhUOqRBvCzGq-+BNqL;xjif4A6ErE)5KFpAH=`gsVIW3}b{|I`|n+ zF|J+nr-+>g8;#3hBPy8%RLn3*w)6W-n;N>}JWz_C~C$Ts5n4ip1P^bj6_ko2#+ZL~CGzGXBy| zG*aN0Al{(eZUyTO!QxHixfZZVb_$r{6BgURB&N^dCmDE`#~5a)nS*#SO|qTl#pP%+ Qq{=o3=P=Jz7wkUp2Z86DZ~y=R diff --git a/target/classes/com/soft/line/filter/GsonUtil.class b/target/classes/com/soft/line/filter/GsonUtil.class deleted file mode 100644 index ab36c600ab1b79226359a4c3d1430f7f966947d8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1001 zcma)5O>fgc5Ph33Cnj;yvqYGOxf z6x%*=_Q>;N8QO0n6&%H$zbjykoiENnI>DiO$Ed*b&T`CAL`C&k2Crka+wEzX?K^>M zAH<;-xTMNWnIf=x4Lpi;#Dv4w{M?WF@>99|jQ zcqGtTns^~6P@9+kVKA1%m@gtu?`XTTFqYZr@+&EhLN&R(*EwT)XA3NQz7s|Nkfgk5 z!{A%hUlu|Sfc6G=Hoc(F@0>$?<06AHZ6OI3P~o~fOMrzccO}%Y!YmE$(`V^xKae>- zN4EEP=M1_1Ctn$x@mR@uk1Bbjf7uoR#MGXQtLV{HJbzo+@(qe_x=LezUL4C diff --git a/target/classes/com/soft/line/filter/HttpRequestUtil.class b/target/classes/com/soft/line/filter/HttpRequestUtil.class deleted file mode 100644 index 09a53921908a1047c42d8d360cce05ac77a938c9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3460 zcmbVP=~ok16#u=DFd-RsL4#TmwX&ymsS0S7ML`270j##w4q<>m$i&G6q5EPtyYIF8 zc22*x^&EtHPLH4Zp?^R>^nYpX?@a<(h!x8@%*?y*-uv$IyZ65Q@z1Zn0oaEhJlKw5 z4@NMm;H(D)c*KKRoO9#67mwmG1&_ON!2>rgy3y{%6VMclc~Fc{5&6dDm+rwr@fd#L_TKaGAi{M9>j3T4bzJ_ECmS<=5SeRnpd!(;7Nhvp`Px(;Kg9i z&}d&*kHGzbkTL6z8xxj45{~NrgcXkXO?^BZ_YcWuS0t=Qt#*Ne8GS*ZA~3DZY5s^7 zo%9DSGaQ}dR&kdRjaypO8r32R-HoRN3ibI|*wh6oGX(mgmOiPQlql>7N5j?;YOQY= z6>xSLt=x-}A~PGd%o3hb(H$niNPxysXR85DDvnm~KNFem--nDlhQ)MoX|hB@QE ztdIFa2ECcL7%TfMM$3L5vlx}Jgr&!+q987Hbgo-RP&elyx|L6rk~&9Vw;j=WKRuGn z{wX?adz~#UkDt|IGOBjU?8NqKG16UDG7?4hyDvIn2yDq86FX)UaZbk##;!U$9}BUS zob1m&q$4BiDVVIK9HHLgprwUoXqKH@1y8d~6g;EgS(b)C2~*drYvZ~ZPnvnK-qv$> z?;ElWl3veAbP9NFn4I78_nnrHYsF3geU8Is~BNRlLT8 zt9Tt(1!}UJQK~R)5K4pJP*H~+D&E9fD&EFb1@EYM7w-v_r!n5E#is};74PE%=0(Ma z_(;Xa_(a90xT@kBK2z|yiZAdb!C<$#WRp|ym5Q(Njlj-qGxGOD1>dUp4&SS&N5dMK z{M{%k2!mtOddMQkgM-J11APNMEuABMfo_3A>rKX*M#1hT198{#VBw_$#$X9lrPmo{ zAkcA-wr~{4w%BV#ShU0*3pkIJhuMSgQE?h-gt{lKR-l2(*5x$?3n<9Zku1gJ7)z$1 zJ=HMmqDqnE7`v3vA}r*pd=lrAvt_m5a}=ix0EeM2ozmj{hN<^N^jTgZ7(@H5dpJK5DbC&A-Svkw- zga4Jqz4;>)F~+pWu~;k;4%t0F2f9@>VePKKo;zT7XXftUq0-_E)dN8c3?Nx zY;gQ`lE$IIXERrRzS+RxYPzo+HUf$uQVw#wi{Y=b3IxAh@#}n&luEanAcRlE{oud`D>!5}`w(Bf$?w`adhC{kp z&3AI|C>>7j1xS+)t8n~{QrpY^dJK@_Vk1Hs2Knj0X$qcMg;pCW@~>tIH5Hqeu|vfct7hGAweb=!~;!W7uEuoP>IgPHMwrWy`xOO1;FL`ddY5)KL diff --git a/target/classes/com/soft/line/filter/ResponseWrapper$Meta.class b/target/classes/com/soft/line/filter/ResponseWrapper$Meta.class deleted file mode 100644 index 016dde094cf401c2145f0c6fb415d6674b34ed26..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 919 zcma)4%Wl&^6g}fOabgT9A(S_i5@_NeykQ4INaaE5~5=bZbP`TghTF946RR>w^jHQaLH;C6$jJKC%`SaopEK}Wz2 z(;X$y8tlt2GKgg|2}VU0C6gxt&Q#^OobY$;X_Q38Gl9$9)4<*qW!8;Ma}Xu!-NAIM zvQKgx8{ssR@s`XY9nX_?u@~he4OJlpyp1GL*?KJVTrt}pgy}TM)7>J7sTS-;aiOx{ zqsnJ#lB?}Z&Som>XfAtPqTfq*-pfo*6>$_;ThQa;uAPZ0%EsH>-f4({OTh5o65LUG zkcH}1q~~g%=;x8%p8!05%i7%c(17dV99#zv1bSzlibEY=#^!img$3)GRFnoI#Z|`9 z*K)m;uHJsze!v z>b%4fk{*b^^SneM9mF zNpDS^m6GE daBU&EdXoHM0olTJQ{o0L(Yq9`arG@U{sMPKty=&9 diff --git a/target/classes/com/soft/line/filter/ResponseWrapper.class b/target/classes/com/soft/line/filter/ResponseWrapper.class deleted file mode 100644 index da21cda211c3eb2e9c33171732adb0efbe8094a9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2606 zcma)8TUQ%Z7~PZGBq2~5E?Pn@D7LvlD8-6}wn_>u5}KM+BK3kpGQiX!lQlExTKX6C zfB32{3u@Q$(FcE&y3fpz3^7adz|5R;zRUjh{=O6b{Oh;h0W3p{V*;Bp9>x*Cqd4N& zlJQ{_SKi+h|9>bnEVRNOraZ<31L%X1BO|@{S>9%SXDyr3D7`0|9t(I!e z2@H%KYA6DWKX3Wqxmve*7FpApnte|~FrC?@Y0+pf`=t`2K5m~JsOD4UK<7@fWYiUX zS1~oQ_BKQIvBs*d4}^xvWUF1Ts}^1Er2kDqX3#L9x&v~Q5aCn=>_H`XOkC+|GITf{_TsVYrZ;CBtJAt9X}7`uF^ zXnNaZQ~VFz9*n^QpRhNSBLD}h3&J6RH}RH)%UvZNDb_L75C@+nkik5~9(VwS*XIemfoloOU{=E1Ag(gLNMIjd z${?Nt)MYdhP;r>R5sn3hthggg(=Zdb3(oIoZ>_A(+0u+cRpr>~+Bfbf`z&3BIQHo+ zG5t6GdwkCIq@_!abA@@WMbTb}tE+s-o)weO#dF?#yyd!_l20~$tIZi$@u&5K^0{}W zwi~gd=C!_Da%}Ck zF{lJ|7M5Ku0Iq5{1bS=Fo^g+&n znx|b@;=&C*?}h%3p@ZC;%f3Q*FPDs*L4Jv7Hvb3Y{P!3-&-W6stVkGi5{@`NQw*MB zozqU@88=QR@tl{KvBg|4-va%o5va*1{0$jFzGW=RxQT%Cc@qL;EZ~5g5uaEhc`gUv zGQ0pv2I6~X7%B;5XGrYilfzTLVB}X^3Zj<#38SaDoF_fCTob+|F@h%bFEzZTVkF``MU#g>a3isJ?E=Qi0_nA?``}n})sld13 uDV+To(cXGiI(*Q;i!X5mihZ18z0PZWoCA2kTmfw0b-v>a6Xx?Z#Qp(T;VvQo diff --git a/target/classes/com/soft/line/filter/StatusCode.class b/target/classes/com/soft/line/filter/StatusCode.class deleted file mode 100644 index 12ca461a13fb448714f9dda8b3ad7fc89dea23b2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2306 zcma)6`%hbC7=8}Dot9n>hdX2AvI=b(wA{P^V@zZYEn|8%w3|8)r9iQ?rj%*a#3h={ zsEISqXw*a#jT+q#lc_T^n*FHzd;HDB_`F|R0Y@^Lyzlcp-+90Hdv9Ow{B!Gf03%rQ z!im#9Jb@=Y81=yN;V{mKIxAlmL_HgaHe^?1~a*4U$o;nJHNuHirM@MBl3h7jwjE~SQ@&|?tl>x-G<8GA9u9glJ}zpP<2a(7(OeS~5r3u!yIU>CFEvEtU5x7X?2 zn9Gz_3rnZ%A}PDTfZY?>e6}>HA+pDPvwMWFz`~VQvpnhxXY!lt;j-&MnG}jk*}R?8 z;I*1wkY0vx9F3v>31m2CBiG)GNk<%q~d z!#ggRVayZvtm7nSz-JXUi|NdXtTZOHJ+K2ZFMhr{KD1Fkma(Ft;~qoq#~4=qIEJhr zLm2iWjQjlP5!EXyA}T5>CaO==5mEi321Lb04T?&LI)*6?!R^tNyfnDdxk8@d?k?*5 z;#wwMVoJM)YC30cY>e+HO=bFbwnMz~T+<#MoQ*C_4e~$XF#mx~H_Kx9%1nU_MQ zrjXewWP%Erqe7;skeMoEvI?26LT0Owsq>~9DIZ|8N&U&)@Zx?v01Xe4bra?1+k*Bp zYHq`EolL_+)Nb|7LHjX`(~sDX5aoo=bjE&x>o%NXU$e`8f;;}Q6^_c?n54Kg9K9r_ z>;oLi*-4^PjAMQ6H{p);{{+tuhg4a%RCmuPo|_$u*z;_Jk##5af^5-$_KCcZ=bi})VU%Xsktv5xo=(IkFKtS5d> zY#@HQ1^xOKyc8d$mg1)bC_zeyVo>TRCZ(RzKnY2X4%M7Vgt+cRi7kJbqxTxe?h;?o zn|wcS@#VbBH*57H_>zhx}wcavsqEEqAf17MNyxkt!}eb(ON~@JZ77s zenk)H<^e?minbeWlhZ`kLB$Um9`m5$A;k|Fx_L-(L-7v7Yj!AJr+BB~GdmSG74I@? z%`U|o6z?|tX1C(?M&LK*;$UyAl#|`DQZDw#O1aq~E9GI2td!0!St)~CK?3(e1a2Ax zFFQuy+cOEZ>>0t&_E|Te$wMf=!!ZQ8cCmqO9D;}ca5~%JWo>;p$EUHzXYdL~@on0D ZLaXm!;1=p|hpn%vyn{KMqK_KP{|j?}zPJDY diff --git a/target/classes/com/soft/line/filter/Token.class b/target/classes/com/soft/line/filter/Token.class deleted file mode 100644 index 016453c1261e3dcfc0d4fb87f2c073b7fb98a72f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1972 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 y9l6RmI6#a?f%`DK|4}xp - - - - - - - - - - - - - - - UPDATE certificate_info - SET cert_id = #{certId}, - cert_type = #{certType}, - cert_name = #{certName}, - project_name = #{projectName}, - cert_unit = #{certUnit}, - begin_date = #{beginDate}, - end_date = #{endDate}, - - note = #{note}, - - modify_person = #{modifyPerson}, - modify_time = NOW() - WHERE - id = #{id} - - - - - - update certificate_info - set modify_person = #{modifyPerson}, - modify_time = #{modifyTime}, - del_flg = #{delFlg} - where id = #{id} - - - - - - - - INSERT INTO certificate_info ( - cert_id, - cert_type, - cert_name, - project_name, - cert_unit, - begin_date, - end_date, - - note, - - modify_person, - modify_time, - del_flg - ) - VALUES - ( - #{certId}, - #{certType}, - #{certName}, - #{projectName}, - #{certUnit}, - #{beginDate}, - #{endDate}, - - #{note}, - - #{modifyPerson}, - NOW(), - 0 - ) - - - - - - - - - \ No newline at end of file diff --git a/target/classes/com/soft/line/mapper/AppletCommonMapper.class b/target/classes/com/soft/line/mapper/AppletCommonMapper.class deleted file mode 100644 index e4b2be6cd60c7def1edd72fcfc0820fa50e00368..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1191 zcmb7DOK;Oa5T14OCT-IM2<1&_)#QRN9FT%4RjrULrBIR5Q!g8P>uzQ5TK1-D{~8B= z06z-xc@yG@1gRWGJ2N|v@0*?d`Rn@+B6?4IReD>cT}JD^4#crATt+86Vbt#Rhu8du zyAvZLcPKM6U{oK;P;oO!1tV`M;NwC9YRt@ttI!>pRH|?=4OsLX3=U9tqiCLYVzk>^ z4qbt#bt24_4o-Q>V_`&^F{=`o2KO(Io!&7w zVg+}v?}0iuhWl5sQ06m8;2{dfw=`nZjCCL{?@qx^D@Ki}c_#DNlCebBd@o?M^L3&O z+~+cr<4DYh0v_6MBelYK_J%qQU7nz&aOD{8%;iOZYqKzb@(qtB=+Fp-v4aqKa?e}l zx#C$a?i2T4+wx_6EqsGrv5ymoX!bazo*kki!N2*(Jzb&B?A?m}?VmGRlL3hI{=QpW z15X(diWIH#gvLluQeS+M5vI{SOp-{LBOS+DVZ{@XzRN!eqkUh;Zl*7d8%ZVH*xtFz z;fz}LSJ^)>WmRFs$iZ(Us+53`O0dhY9BWsp2CWXe3^e&+uO1+@N$az#?Fwzcy$NYS zwjgat2l5bdR6)r{kjEL~=IUmlwhDEtP}_ytLBB3N0lXYa-LbXv9#c5mwolhtNGQ}c ea-Y&OIA%1S6T$U@UKY$=%}c#T+#6U9?feF#VKq?z diff --git a/target/classes/com/soft/line/mapper/AppletCommonMapper.xml b/target/classes/com/soft/line/mapper/AppletCommonMapper.xml deleted file mode 100644 index 3dbf951..0000000 --- a/target/classes/com/soft/line/mapper/AppletCommonMapper.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - insert into attachment_info( - attachment_name,attachment_url,modify_person,modify_time,type,c_id - )value ( - #{attachmentName},#{attachmentUrl},#{modifyPerson},#{modifyTime},#{type},#{cId} - ) - - - - - - delete from attachment_info where id = #{id} - - - - delete from attachment_info where id in - - #{id} - - - - \ No newline at end of file diff --git a/target/classes/com/soft/line/mapper/AppletContractMapper.class b/target/classes/com/soft/line/mapper/AppletContractMapper.class deleted file mode 100644 index 36eae86fe22cd9358eea6abb3238143ff02c3321..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1612 zcmb7ETW=CU6h4Ec6seR#f!1qVt$-T$#Rn6N37Tj~XtiQYd>nR1*t+a)c4wRL;t%t| zAK;HNetRim3O7x^ePZ?EI%ajgR<(W5URPXji7yObd zp41Ixq`R`us65uECYPQg7`FDOPA36k@kp=lRevBGZA>T&1 zzY6a7$rv4V({TM9KDARJXO{MnJA5vra9l_jikh&88lx>2Q~0dUF@)n!z{Bl}?&=dmEE_Q} zO-pjATP9j^GP0bh!fme3grZNNb`>5wC_xnX7B9Ks0koOmJ;prLS;(}VVxP1$b87Gz zZ!cF0^I^1?06zDGvj}lpDcppio|$0Z$9$PlUU#ert#D1dS~N!8?nt%fifet7ilLiA z5oo1cCi4Sx-Ym|73GL@-2d3t4T`MA-+|!{ykb(~D&9UV+^`Jr4sI)q)2oNEm)tn~abT&lXX2gV7DzfLw%BpiRgn+QO|2xd=x7Utp@h zw7uSRi>gsnxj;LJsNwA5v9+Ho5?xOU-Epx$2uBcFT# diff --git a/target/classes/com/soft/line/mapper/AppletContractMapper.xml b/target/classes/com/soft/line/mapper/AppletContractMapper.xml deleted file mode 100644 index 605ac49..0000000 --- a/target/classes/com/soft/line/mapper/AppletContractMapper.xml +++ /dev/null @@ -1,211 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - insert into `contract_info` (`dep_id`, `contract_name`, `pro_id`, - `total_amount`, `part_a`, `part_b`, - `sign_time`, `sign_addr`, `begin_date`, - `end_date`, `payment`, - - `note`, - - `modify_person`, `modify_time`, `del_flg` - ) - values (#{depId,jdbcType=VARCHAR}, #{contractName,jdbcType=VARCHAR}, #{proId,jdbcType=VARCHAR}, - #{totalAmount,jdbcType=DECIMAL}, #{partA,jdbcType=VARCHAR}, #{partB,jdbcType=VARCHAR}, - #{signTime,jdbcType=TIMESTAMP}, #{signAddr,jdbcType=VARCHAR}, #{beginDate,jdbcType=TIMESTAMP}, - #{endDate,jdbcType=TIMESTAMP}, #{payment,jdbcType=VARCHAR}, - - #{note,jdbcType=VARCHAR}, - - #{modifyPerson,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}, #{delFlg,jdbcType=CHAR} - ) - - - - - UPDATE contract_info set - dep_id = #{depId} , - contract_name = #{contractName} , - pro_id = #{proId} , - total_amount = #{totalAmount} , - part_a = #{partA} , - part_b = #{partB} , - sign_time = #{signTime} , - sign_addr = #{signAddr} , - begin_date = #{beginDate} , - end_date = #{endDate} , - payment = #{payment} , - - note = #{note} , - - modify_person = #{modifyPerson} , - modify_time = #{modifyTime} - where id = #{id} - - - - - - update contract_info set modify_person = #{modifyPerson} , del_flg = #{delFlg} , modify_time = #{modifyTime} where id = #{id} - - - - - - - \ No newline at end of file diff --git a/target/classes/com/soft/line/mapper/AttachmentInfoMapper.class b/target/classes/com/soft/line/mapper/AttachmentInfoMapper.class deleted file mode 100644 index 5ba63c1b5edabb97b1f42a51f1c3527e97db0f48..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1220 zcmbVL%Wl&^6upx+4GFZQ0a^;>RjE?4VKxX5sVb!lq=*!%2C<{k#F@HN+2d$DuH;{1 z!3XeBh~sf&=OLA-i;+Ed?mg$+*Pp+?eiP98ogn(p>!;bWz=pDyeQ;xbZL2@ zwB%A-WmDd>R(Mw-Zhd_jbvu1V%~NTwqVbt9B9vB|7%)b9ks0G>ECbja-nF<9JP_LF zLu-`wyMxlw*H-${IJ_-UaC}cEh+XsgfI2u&AR&}LRIEmUEa-Y#M^;!BX%HU{BI9#0 zfkw&I2gD=9q&!A>FbB+dHW)8nrgBu4LVXP#!!nd#0{ z^2`9`NI&m{w0a7SVU!q8W>dsyZ+=BEF%xOtW_4xMncpc45#APdDi6SDmfMj}%LXHK z7W+z6TgO(=I__26s@O9km}+zn4wMKc*)o>5e1arKixcK$=JF{g3<^J)e)=FW6q(7P}7-FP*4Y{{RcWMkxRQ diff --git a/target/classes/com/soft/line/mapper/AttachmentInfoMapper.xml b/target/classes/com/soft/line/mapper/AttachmentInfoMapper.xml deleted file mode 100644 index 7830d8d..0000000 --- a/target/classes/com/soft/line/mapper/AttachmentInfoMapper.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - insert into `attachment_info` (`attachment_name`, `attachment_url`, `modify_person`, - `modify_time`,`type`,`c_id`) - values (#{attachmentName,jdbcType=VARCHAR}, #{attachmentUrl,jdbcType=VARCHAR}, #{modifyPerson,jdbcType=VARCHAR}, - #{modifyTime,jdbcType=TIMESTAMP},#{type,jdbcType=VARCHAR},#{cId,jdbcType=INTEGER}) - - - - delete from `attachment_info` where `type` = #{attachmentType} and `c_id` = #{cId} - - - - delete from `attachment_info` where `type` = #{type} and `c_id` = #{cId} and `attachment_name` = #{attachmentName} - - - - delete from `attachment_info` where `type` = #{type} and `c_id` = #{cId} and `id` = #{id} - - - - - - - - - \ No newline at end of file diff --git a/target/classes/com/soft/line/mapper/ButtonInfoMapper.class b/target/classes/com/soft/line/mapper/ButtonInfoMapper.class deleted file mode 100644 index 3c43bf50698cd10a88f990f57b8835dc84f88d39..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 890 zcmbVKOG`pQ6h31<(q3kn)uKfZ*rwSO1V*5XNKgueHmycI-bUum$lSStf2~D7pdS?- z@AcIKk`}|9=Xbt2^Syt(z5&1`9B1G#14j(90V?des!|LJ<@3fsj06vzRJ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/target/classes/com/soft/line/mapper/CertificateInfoMapper.class b/target/classes/com/soft/line/mapper/CertificateInfoMapper.class deleted file mode 100644 index 0907e37cd2305f70fb2b6608030fb8a5a6c70331..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1661 zcmbVMTTc@~6h2d+P((mb5yT4!*rKv8KA4n{0EwotU<1a)Co^n^GGupVGdoMNf6WJf zfIrIk?S*!`qE;U!yL0B8?|kR_{m0jDMD&_=Ch6rQy<$|ADip>tYSi1V_MK3lTgQ`1 zI6_%zW9JaB@?5&yik3Rp%|?sS{E@I1y4&G~`@#wnGMaOT^%%`$$S1cOol2=ZFU>^q9{BMzvGfQ`|-dYHvzvyP1{8RnIxKMyg)3Ao*~1DO}s! zOTns9&;@U}3gOeW2XV(ppPTr-hzGzaQd$7roY5>SKK+A_3F zM!KXkY9J+~-O)(y!Q*UC*bd60757q_8##qy@@`-{6`?1NQCmjs5iI_J(J~l;$)WZG zuHr&(p@mjl9VuIo9mK8fzUm&fknDPqM@w1J6Q)@Ayc3e{tR}6P*sPxbPx|7M4CR?8 z`t7=}l(yVTt>AUDtxeD20e3HiBhMfX9X?QSQY++g;);6_5|ZQ;5hUD_y24AbtZAul z$Y@pO+F#1r#V)vx3*GzwMPE$QcpUlfjE;hX__N?98MZPcVru;&%-LLzWRct-W-aNp zrIOpEjvwOy8Jj-Uk#WUa>EW_csBf}QF!zBlJISyxS{^RgP@T5^Ql|_EM7D?581@Mq zl-F3MjZKzLX*v$s=BP5lcw0ef01LEu6Tn>n+@t%0r=>pj13WGN-fD#&=2o=|!3VA4Ji=M3!1rUE zCn4nh-&Mdpr8UHxN3q`b^enZTN%E50twVW(HX+F3+`|2N@ebE@*jK1Q+xS+Y`GV*t Dpx4FQ diff --git a/target/classes/com/soft/line/mapper/CertificateInfoMapper.xml b/target/classes/com/soft/line/mapper/CertificateInfoMapper.xml deleted file mode 100644 index ce9c88a..0000000 --- a/target/classes/com/soft/line/mapper/CertificateInfoMapper.xml +++ /dev/null @@ -1,156 +0,0 @@ - - - - - - - - - - - - - - - - - - - - insert into `certificate_info` (`cert_id`, `cert_type`, `cert_name`, - `project_name`,`cert_unit`, `begin_date`, `end_date`, - `note`, `modify_person`) - values (#{certId,jdbcType=VARCHAR}, #{certType,jdbcType=VARCHAR}, #{certName,jdbcType=VARCHAR}, - #{projectName,jdbcType=VARCHAR},#{certUnit,jdbcType=VARCHAR}, #{beginDate,jdbcType=TIMESTAMP}, #{endDate,jdbcType=TIMESTAMP}, - #{note,jdbcType=VARCHAR}, #{modifyPerson,jdbcType=VARCHAR}) - - - - insert into `certificate_info` (`cert_id`, `cert_type`, `cert_name`, - `project_name`,`cert_unit`, `begin_date`, `end_date`, - `note`, `modify_person`) - values (#{certId,jdbcType=VARCHAR}, #{certType,jdbcType=VARCHAR}, #{certName,jdbcType=VARCHAR}, - #{projectName,jdbcType=VARCHAR},#{certUnit,jdbcType=VARCHAR}, #{beginDate,jdbcType=TIMESTAMP}, #{endDate,jdbcType=TIMESTAMP}, - #{note,jdbcType=VARCHAR}, #{modifyPerson,jdbcType=VARCHAR}) - - - - update `certificate_info` set `del_flg` = '1' where `id` = #{id,jdbcType=INTEGER} - - - - update `certificate_info` set `cert_id` = #{certId,jdbcType=VARCHAR}, - `cert_type` = #{certType,jdbcType=VARCHAR}, - `cert_name` = #{certName,jdbcType=VARCHAR}, - `project_name` = #{projectName,jdbcType=VARCHAR}, - `cert_unit` = #{certUnit,jdbcType=VARCHAR}, - `begin_date` = #{beginDate,jdbcType=TIMESTAMP}, - `end_Date` = #{endDate,jdbcType=TIMESTAMP}, - `note` = #{note,jdbcType=VARCHAR}, - `modify_person` = #{modifyPerson,jdbcType=VARCHAR}, - `modify_time` = #{modifyTime,jdbcType=VARCHAR} - where `id` = #{id,jdbcType=INTEGER} - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/target/classes/com/soft/line/mapper/CodeDetailMapper.class b/target/classes/com/soft/line/mapper/CodeDetailMapper.class deleted file mode 100644 index e0290367d1c09676fee8598d2dbebeb2f81deb3f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1009 zcmb7?T~8B16o$_f+R|F3d?V_O!KA%mLIMd%jR`_D#uAA&-cPs3GGun9nVluszs3bW zfFEUiw`(a-B6u;`oipd-Ip;mszb~(dXpi1h=~b0p3#w?Fun&T^TiwXTGI76xG}^Lc z8+6FzksI(a2c=D?{Y6mogu|H|oGPzk4(t=8@Ekcm5VV}I;V68}PQ8wm&%Sad=yR)k zt}c``$_`~Ocx{KBSxfuT;(`_;p!~>2EU2FU7F2@XeouiK^G}`VzTq3RLu*}7K|2e` zcU|X)QjJt}#!~lTPNbST$Z=FhQ29cc6cx6LUXGj%7{u<~o(`Va(@f)nYDL~dV=%8) zyO=~8w2@t%1OU`}dT3QhJs|dH9Ns@Vrw_={oCuMNS4<4@&d@wi{UNpPyFHCz^)|y~ zjDi}ua?@+Q=TaZ>CvDK~T8>+&dZI=n_B%N;w7a{Q@%Zi5ViwM5d)nc*{y8?WB1ljP z3r|#;7c@unxR-G&V{3_Es?q`+a#O8DHGJwg&u}(MaBbi`Phh|Kts~|IE&g{*la`QV q8Hr1@f*h-~2AsbrdEMe^eO$YdV^3ZuhXg?Y diff --git a/target/classes/com/soft/line/mapper/CodeDetailMapper.xml b/target/classes/com/soft/line/mapper/CodeDetailMapper.xml deleted file mode 100644 index 09bdbc0..0000000 --- a/target/classes/com/soft/line/mapper/CodeDetailMapper.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - insert into `code_detail` (`code_type`, `code_detail`, `code_content1`, - `code_content2`, `code_content3`, `code_content4`, - `orderby`, `note`) - values (#{codeType,jdbcType=VARCHAR}, #{codeDetail,jdbcType=VARCHAR}, #{codeContent1,jdbcType=VARCHAR}, - #{codeContent2,jdbcType=VARCHAR}, #{codeContent3,jdbcType=VARCHAR}, #{codeContent4,jdbcType=VARCHAR}, - #{orderby,jdbcType=INTEGER}, #{note,jdbcType=VARCHAR}) - - - - - - - - - - - - \ No newline at end of file diff --git a/target/classes/com/soft/line/mapper/ContractInfoMapper.class b/target/classes/com/soft/line/mapper/ContractInfoMapper.class deleted file mode 100644 index f29eed3c3e806292e7c721d52094706ab485f256..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1851 zcmb_c+iuf95S>lil$5rV-YHOM=q2G&bLj(8s!9n66p@yyt&kABZ0v2i#a>72btV5A z4}1V0g&6PJiQ^O$As$xp%$_-OW_CP3e|`S}0DG`E2`?w%6@elb0h5ZrcBN(eo)!4# z%5u42788oA$a>=oC8@2N;@q!Qn*`<#nY!?uV=Ae~6q5mgX*&Z#({P?J+m{Zekm-lR zT#O(vUuj*^D{6&`yVfD?YThxAb_tYDc}GwcN`$@6!S+p*OGU>zRg#NNE#vvvzGSwl z9cZ#**mbB*6<|(VHKJq5Ju0IQEb0?$rlwG=!(^>GLj42^94jgr(z@#s*vN@Qo_=jD z9;g}tH-{OukQ~$g2nr7{-C~C+)K+i%p-P_*Uuo6$L(y|IqNY<9&JjK$fl4B9pdp#w zCf$yozxUQAvV4M^++&}3z}qhCO+{S@Us1(MJ^(0ecau-k|}Gb-bm z&hueG%^_zZC7t}NvcHUU{HpW0v~L;yE^EWivkM*=Nz3}O?#0hOpmk~ZLbI95@N)pY znH`RF5^}vmePd26=*tM;|ImX*bQX1)DbrMwmYohf3aZ5OIzx5+CscgHg+X8nW%i9z zKa@6m$6cJdl{7S7b-0zfOzy_NGJ&1J&4`N%?*=xbf#Y)2|Gxf>%swg-z@>pZ7hqu= zHNiOA6KGA~Vgx|fWY%>f~WBmU$M1rM1 zUoFE*5>+Yy62U5-J9t(Km|zXh-2nZ)&sC(m2luh4MCv+XjnoG^ZaOYLiCahTL)buv zL6p&cl(RQ;_Eyf`&e=Oq=_jxDl0P0wUd3cja=}mGneNqY&TnOHl=~cc3-IDMr!V5J diff --git a/target/classes/com/soft/line/mapper/ContractInfoMapper.xml b/target/classes/com/soft/line/mapper/ContractInfoMapper.xml deleted file mode 100644 index 594fdd9..0000000 --- a/target/classes/com/soft/line/mapper/ContractInfoMapper.xml +++ /dev/null @@ -1,252 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - insert into `contract_info` (`dep_id`, `contract_name`, `pro_id`, - `total_amount`, `part_a`, `part_b`, - `sign_time`, `sign_addr`, `begin_date`, - `end_date`, `payment`, `note`, - `modify_person`,`contract_type` - ) - values (#{depId,jdbcType=VARCHAR}, #{contractName,jdbcType=VARCHAR}, #{proId,jdbcType=VARCHAR}, - #{totalAmount,jdbcType=DECIMAL}, #{partA,jdbcType=VARCHAR}, #{partB,jdbcType=VARCHAR}, - #{signTime,jdbcType=TIMESTAMP}, #{signAddr,jdbcType=VARCHAR}, #{beginDate,jdbcType=TIMESTAMP}, - #{endDate,jdbcType=TIMESTAMP}, #{payment,jdbcType=VARCHAR}, #{note,jdbcType=VARCHAR}, - #{modifyPerson,jdbcType=VARCHAR},#{contractType,jdbcType=VARCHAR} - ) - - - - insert into `contract_info` (`dep_id`, `contract_name`, `pro_id`, - `total_amount`, `part_a`, `part_b`, - `sign_time`, `sign_addr`, `begin_date`, - `end_date`, `payment`, `note`, - `modify_person`,`contract_type` - ) - values (#{depId,jdbcType=VARCHAR}, #{contractName,jdbcType=VARCHAR}, #{proId,jdbcType=VARCHAR}, - #{totalAmount,jdbcType=DECIMAL}, #{partA,jdbcType=VARCHAR}, #{partB,jdbcType=VARCHAR}, - #{signTime,jdbcType=TIMESTAMP}, #{signAddr,jdbcType=VARCHAR}, #{beginDate,jdbcType=TIMESTAMP}, - #{endDate,jdbcType=TIMESTAMP}, #{payment,jdbcType=VARCHAR}, #{note,jdbcType=VARCHAR}, - #{modifyPerson,jdbcType=VARCHAR},#{contractType,jdbcType=VARCHAR} - ) - - - - update `contract_info` set `del_flg` = '1' where `id` = #{id,jdbcType=INTEGER} - - - - update `contract_info` set `dep_id` = #{depId,jdbcType=VARCHAR}, - `contract_name` = #{contractName,jdbcType=VARCHAR}, - `pro_id` = #{proId,jdbcType=VARCHAR}, - `total_amount` = #{totalAmount,jdbcType=DECIMAL}, - `part_a` = #{partA,jdbcType=VARCHAR}, - `part_b` = #{partB,jdbcType=VARCHAR}, - `sign_time` = #{signTime,jdbcType=TIMESTAMP}, - `sign_addr` = #{signAddr,jdbcType=VARCHAR}, - `begin_date` = #{beginDate,jdbcType=TIMESTAMP}, - `end_date` = #{endDate,jdbcType=TIMESTAMP}, - `payment` = #{payment,jdbcType=VARCHAR}, - `note` = #{note,jdbcType=VARCHAR}, - `contract_type` = #{contractType,jdbcType=VARCHAR}, - `modify_person` = #{modifyPerson,jdbcType=VARCHAR}, - `modify_time` = #{modifyTime,jdbcType=TIMESTAMP} - where `id` = #{id,jdbcType=INTEGER} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/target/classes/com/soft/line/mapper/MenuButtonInfoMapper.class b/target/classes/com/soft/line/mapper/MenuButtonInfoMapper.class deleted file mode 100644 index 2fea8b5510abb9d255b60cf5884a6170bf11d9af..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 972 zcma)5U2oGc6umBOx|T7v0UhOQ2#G0u!7sdwPDt$oQba2zD)H{7UgjyWE616Xzs3VU zfFFf8`PkL~5`C~7AD?^9^}RPge|`T!MDOW!mtJ-0n31P+Dy?JW`?Js_JT(`N$4W~s zwNozVbE&gw=A6-izA)oaz-WIi-KANb3o8=oq)j1XWoYb*(QqYWVAH&a3sw`os)KPi z@PpZvxE4GXI^qjwm5xe5FDc24c9xYB$Zx)8NFb5lRH~M-yfvF>ZJcn*XxP4;85?o2 z7U8AjY6&>y;*P+}s4=6?wTLsxXs?+aqqZLuFFH(-b?Bz~xmAg<`Dd9k`rvP58)zpZ zX~(0js>G$dvJ!&Z zs5zxcY4FFCR%8t7-L!pKUZKGrBeVv80Fl>bbdTCNcW~-pgoyxkX$OP?>b0nct&epd z>!=0lF4lt-`0ZyOF?;l|j)6=OQ}A~Ss~bK@`*Z-H_Bt%R9?@e!Pe5+b0F)zo+SIA8 Sh5( - - - - - - - - - - - insert into `menu_button_info` (`menu_id`, `button_id`, `modify_person`, - `modify_time`) - values (#{menuId,jdbcType=INTEGER}, #{buttonId,jdbcType=VARCHAR}, #{modifyPerson,jdbcType=VARCHAR}, - #{modifyTime,jdbcType=TIMESTAMP}) - - - - - - - - - - delete from menu_button_info where menu_id=#{menuId} and button_id=#{buttonId} - - - - delete from menu_button_info where menu_id in (select mi.id from menu_info mi where mi.id=#{menuId}) - - - - \ No newline at end of file diff --git a/target/classes/com/soft/line/mapper/MenuInfoMapper.class b/target/classes/com/soft/line/mapper/MenuInfoMapper.class deleted file mode 100644 index e785bf38ba19187d86654dc877f3e829553c9546..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1512 zcmbVM+fExX5FLk02qhFk3%y^Up`jP{p{S}9REazwMGXa!UY<>2g3-o~yk4aIS|9oW z{iv$P>n+(PD?oj)>>1BFGjn|T_4~(9BHE$tBE2cnTSl`|MZ#D{>$O%#_k&2E+8~rl z1VUM9hrxkRaZ{b@`c{+C(t)sNx_iV8?+YtT1Og*E+H|pq2VHIj7F`iylhJCebqn%vHHI<<*&xN{BwX2xX)W9Vv`Hj6W zWb{7E-L^)mUOiJ_>e=$H*vc?y$;j3j&Go_f867h!y5&~`wo+U66t}T~_xpb_?_Sf^ zN2Fdqj&Tfq@l8hZBovpz?{-ITL|AfjbKLC?H5sAe*`1VT^Li z9Sv3|lW(e)E&uO1>0o4fn#L!E(dt^y>%>Wp2bl_P35LWY^_#|7X40Rc&tOw#Eq%uiILO6tVsd;Hv!z_ ztjj%Nvp2X>Yi9Ev@BupcFyYJ*E+ggP$vGZb-H9;Y*0Je`eHr2otT++ey9Vt*m~Hn^ z8EyP4Wk1=w`~rL^UfbwZd-_>Mj0*Tzh|1G=dNd7t2G$II10uMJldd@`jiTn0s9Ur! z?kZ%c(|)P|zoc5) R1cF@?K6ndJuV5AE^&cmFd(8j< diff --git a/target/classes/com/soft/line/mapper/MenuInfoMapper.xml b/target/classes/com/soft/line/mapper/MenuInfoMapper.xml deleted file mode 100644 index fbb5ef1..0000000 --- a/target/classes/com/soft/line/mapper/MenuInfoMapper.xml +++ /dev/null @@ -1,119 +0,0 @@ - - - - - - - - - - - - - - - - - insert into `menu_info` (`menu_icon`, `menu_name`, `state`, - `menu_url`, `orderby`, `p_id`, - `modify_person`, `modify_time`) - values (#{menuIcon,jdbcType=VARCHAR}, #{menuName,jdbcType=VARCHAR}, #{state,jdbcType=INTEGER}, - #{menuUrl,jdbcType=VARCHAR}, #{orderBy,jdbcType=VARCHAR}, #{pId,jdbcType=INTEGER}, - #{modifyPerson,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}) - - - - update `menu_info` set `menu_icon` = #{menuIcon,jdbcType=VARCHAR} , - `menu_name` = #{menuName,jdbcType=VARCHAR}, - `state` = #{state,jdbcType=INTEGER}, - `menu_url` = #{menuUrl,jdbcType=VARCHAR}, - `orderby` = #{orderBy,jdbcType=VARCHAR}, - `p_id` = #{pId,jdbcType=INTEGER}, - `modify_person` = #{modifyPerson,jdbcType=VARCHAR}, - `modify_time` = #{modifyTime,jdbcType=TIMESTAMP} - where `id` = #{id,jdbcType=INTEGER} - - - - delete from menu_info where id = #{id} - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/target/classes/com/soft/line/mapper/RoleInfoMapper.class b/target/classes/com/soft/line/mapper/RoleInfoMapper.class deleted file mode 100644 index f24cd9f70692660304d306ab9a6aa4c2cf92b357..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 948 zcma)4U2oGc6umBMx{i*G7B;?-_>k5Y{JZk<_R)Qy5GkVq5sU3}5)lOCJz}vLY_>4jsefST?(G5n9AsH-CmalKGEx0ZP z9S;1X6BvGRUZ9dhepR`eYq@Uui7}}YPNfFTe?3iY%ta=mOUcz7;hc*Gz)Ke1?OqFA z;Mwgcg{tpORoB7aY_x{6YK|ZMY9bB$ZJWJ<-p~a`TeGyVk^HDM42`^+pA$ALllF~Y zIYuvkA1O8rx%EgZC>)jhSuR7hL;)jA8~aSu+rVbh25w#4y6CG9;&f;ess6uHTXY*L zHETcw^fujTgm%_KyGY%oVUrpmbq{CYecZ>{%V`AAK0T;G{SHBryoLwvcN*ZJ`P~8M SAw5E%w&C%N9^>1gC%*u-R`KTm diff --git a/target/classes/com/soft/line/mapper/RoleInfoMapper.xml b/target/classes/com/soft/line/mapper/RoleInfoMapper.xml deleted file mode 100644 index 84cc1ea..0000000 --- a/target/classes/com/soft/line/mapper/RoleInfoMapper.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - - - - - - insert into `role_info` (`name`,`state`,`modify_person`,`modify_time`) - values (#{roleName},#{state},#{modifyPerson},#{modifyTime}) - - - - update `role_info` set `name` = #{roleName},`state` = #{state},`modify_person`=#{modifyPerson},`modify_time`=#{modifyTime} - where `id` = #{id} - - - - - - - - delete from role_info where id = #{roleId} - - - - - - \ No newline at end of file diff --git a/target/classes/com/soft/line/mapper/RoleMenuMapper.class b/target/classes/com/soft/line/mapper/RoleMenuMapper.class deleted file mode 100644 index 989d0654f36a71c52dc96569a76d0ab2ca67e4e5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 866 zcmah{%We}f6ul04O(~@hNGXpE6;iSQFX*laDOn&zBqC}g_D<$@>dIqB9#5tDH5PmT zAB8xRv@-!JSX|BZ@$tFGXZ+*mx9>!BMz1>bqC+nQwYAOI2SL;R@&>r&hR)!ld{drrn|^PaJFoBQy1&YVg{zO zf?i+bHt3YU>P#;TS29CuT~I+g3&A%N=M$+`YI(&{F92s!)daadbuOrNqfE|%4l_2q z45MP^b*g;vnF~Q@_g#E2S-Mna?lMTDElY-(P{<2hU<&WhY-pH{HiAQAAl@Hr;>v?I za-y>URy5a%RU!A7{{An*hyP6Z2!*{Eo&%4Ha&{S1?_R%1ykeFPOXkVl(G4)P@u-Ts z*B@{F+^zq%Gk3XP@+WOz`RMM#Q?**Le^ t0iZ)b4LZX52|cYT7z(Jj4Z#DTV|sRLEoxM@N=wI$dg32GPS!J?{{lYL*xmpD diff --git a/target/classes/com/soft/line/mapper/RoleMenuMapper.xml b/target/classes/com/soft/line/mapper/RoleMenuMapper.xml deleted file mode 100644 index 8d7cce3..0000000 --- a/target/classes/com/soft/line/mapper/RoleMenuMapper.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - insert into `role_menu` (`role_id`, `menu_button_id`, `modify_person`) - select #{roleId}, mbi.id ,#{modifyPerson} from menu_button_info mbi - where mbi.menu_id = #{menuId} and mbi.button_id = #{buttonId} - - - - - - delete from role_menu where role_id = #{roleId} - - - - delete from role_menu where menu_button_id in (select mbi.id from menu_button_info mbi where mbi.menu_id =(select mi.id from menu_info mi where mi.id=#{menuId})) - - - - delete from role_menu where menu_button_id in (select mbi.id from menu_button_info mbi where mbi.menu_id=#{menuId} and mbi.button_id=#{buttonId}) - - \ No newline at end of file diff --git a/target/classes/com/soft/line/mapper/UserInfoMapper.class b/target/classes/com/soft/line/mapper/UserInfoMapper.class deleted file mode 100644 index 9d464b13206cde679dc97db881a9692396d3a23c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1394 zcma)6+iuf95S`7nX`41Q5bl?@TpU0cseN-*sd+%MNNLmv`n)7tXDesdTCYL=H6Hi? zJ_<2wJI%!r$wQ*enb|pK&d%h|-(SB0;27Rl;cXS(5vXtxGNlO|Slxjf+o8PHw$BB# znb2Iv_E!wM;#xXwmq6p3>5&}vsG?)0nF_IhVgsp$1olGavw`l!J;ldV#h+PB;MnTk z&>z(Hsqk!9Xy!5Hv{x_@C~z!TOADU)J{GsyX`x7S-|q5IJDAYto}fBXjKEPY;baBN zsi_cQcU|dmLEvL1HDNfX!5T7)V;T_nws7%erscj?TzF0%IbEatmd7-9Z(ab6-d~`> z0*SS=j*J#^{x9X?`wc#rW2DSiTF1KTkR{3plq}cG#!eIrsb-UTA+TZ0HKRkIiJeRW zo%kYP!o>$Z%G4&qkvX+`HYzf^Zp{_#jig{_VrXc-;B?}#N5k-EGMiURnDTFuM^>vT z2ZlFm*6`vnxaDo6o}>+TV$*bMiIiFYrlMPxyF?K>y^Yr6_DyW84`d{8?=Gd!3`0d_ zht0l>)PQ~BKB{U?{KwG_nEGH|oWSAy&f`2|>~`nVR9yS%4yQ9yA%IJY|0DqQ5`iL= z@OK%1m609*p(<=lp;`iM!WKf?m{mw_?Z7UcvRe&=)6gBfy$8)@p}QEm2d%}z_h;!J zBwP>S(KPFE0zHAJ8B{OAGo*WtpBG7J9}comtpJz}so+C+IfW6*vR~yDyq<;LU?u?z IzYEa*2cREu`v3p{ diff --git a/target/classes/com/soft/line/mapper/UserInfoMapper.xml b/target/classes/com/soft/line/mapper/UserInfoMapper.xml deleted file mode 100644 index 513d3ca..0000000 --- a/target/classes/com/soft/line/mapper/UserInfoMapper.xml +++ /dev/null @@ -1,149 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - insert into `user_info` (`user_name`, `password`, `phone`, - `modify_person`, `modify_time`, `head_img_url`, - `user_status`, `role_id`, `salt`, - `open_id`,`dep_id`) - values (#{userName,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR}, #{phone,jdbcType=VARCHAR}, - 'admin', now(), #{headImgUrl,jdbcType=VARCHAR}, - #{userStatus,jdbcType=VARCHAR}, #{roleId,jdbcType=INTEGER}, #{salt,jdbcType=VARCHAR}, - #{openId,jdbcType=VARCHAR},#{depId,jdbcType=VARCHAR}) - - - - - - - - DELETE FROM `user_info` - WHERE `id`=#{id,jdbcType=INTEGER} - - - - UPDATE `user_info` - - `user_name`=#{userName,jdbcType=VARCHAR}, - `password`=#{password,jdbcType=VARCHAR}, - `phone`=#{phone,jdbcType=VARCHAR}, - `modify_person`=#{modifyPerson,jdbcType=VARCHAR}, - `head_img_url`=#{headImgUrl,jdbcType=VARCHAR}, - `user_status`=#{userStatus,jdbcType=VARCHAR}, - `dep_id`=#{depId,jdbcType=INTEGER}, - `role_id`=#{roleId,jdbcType=INTEGER} - - WHERE `id`=#{id,jdbcType=INTEGER} - - - - - - UPDATE `user_info` - SET `open_id`=#{openId} - WHERE `id`=#{id} - - - - UPDATE `user_info` - SET `password`=#{password} - WHERE `id`=#{id} - - - - UPDATE `user_info` - SET `open_id`=null - WHERE `id`=#{id} - - - - - \ No newline at end of file diff --git a/target/classes/com/soft/line/mapper/WorkJournalMapper.class b/target/classes/com/soft/line/mapper/WorkJournalMapper.class deleted file mode 100644 index 852ee958ce172fd3d4e63e5b8eef38be428e6453..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 450 zcmaiwy-ou$5QNA1I}-jv3f=&8*Wf0i2||Jb3Al(zDX7h52@XCx@;Q<2)hKuX9tyGC z6$zq9w>utv>zS|bk52$Y3?lR+oCtKZEyxFfvpCIME(`Y>q|ufn*`PxypPheya4T<> z8721u{V|0%H=8K0ath=NW_Ze+p9u^KGL(hea^iKaeECSFz%Wi1YOSPEb}mzA=c8oz zC4q)!V7CU|7{l;5sX?otjZAeBMr@esxm981N#OFI;cEAxYlifuoG+t0ZJ2Vp6?m+c zOY#@L-xoOlTTfoSZP!z~xuH$mr02{h5-z0F&jy8~E?u(y%AmDIyN PO9$*~;E<=IYC8S_5}tf| diff --git a/target/classes/com/soft/line/mapper/WorkJournalMapper.xml b/target/classes/com/soft/line/mapper/WorkJournalMapper.xml deleted file mode 100644 index 1f244c8..0000000 --- a/target/classes/com/soft/line/mapper/WorkJournalMapper.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - - - - - - - - insert into `work_journal` (`work_type`, `work_table`, `work_table_seq`, - `work_date`, `note`, `modify_person`, - `modify_time`, `db_op_type`) - values (#{workType,jdbcType=VARCHAR}, #{workTable,jdbcType=VARCHAR}, #{workTableSeq,jdbcType=BIGINT}, - #{workDate,jdbcType=TIMESTAMP}, #{note,jdbcType=VARCHAR}, #{modifyPerson,jdbcType=VARCHAR}, - #{modifyTime,jdbcType=TIMESTAMP}, #{dbOpType,jdbcType=VARCHAR}) - - - - \ No newline at end of file diff --git a/target/classes/com/soft/line/service/AppletCertificateService.class b/target/classes/com/soft/line/service/AppletCertificateService.class deleted file mode 100644 index a01a60374dd799a8adf3081d264cc04e74757ad0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 878 zcma)4O;5r=5S>Ln1Qh`lxOnq`7ka>3jR`UFR21!rc9&nT6c3x_LwO;!x<2KSZ|u8cUGE5jE7 z8i^9VF_{|UCI9-sIPsOqpsSb8kV{L%ios}LE%}<~RXj3}YS)^eT7>SDOTI#dGG=fZ zZGR>_VoOpcXiCl7P z$2bPoV9zuRlu#RE97Vq7@o_@he7}xpU8GhzZC}@B(-xdXE}OfqCb6gIz9%R*S!%-$ z6Y1cK@X6oX1IaeZwQz8_T`Pm3ejITI9uAsUF=(adknShjMwJ1B5?vxdz0BYQ$^i6M ypi0piMJu%YEl6Jp8U&pcL+8cN1vH5$Z+Mw6kNt`Bi7aw&vLyB@#f|fKa)S$*ve4wplbmj+ zOJi|(HCd^(l2&DjoKvM6{zU%esXIklx@e}VyM(?F5X5{!K+Qw~n$>*Glz>j^A`?H% zc*kV|jy}VnCled32)B7!b60wel~Do5qdd1rW0$5bo1M!0tzUg#@P`u3Q*NlEuT8brw;R}IyAJ0l~yy6Kl%?H=Qn8OP`Yb7vEBIvziZL< diff --git a/target/classes/com/soft/line/service/AttachMentInfoService.class b/target/classes/com/soft/line/service/AttachMentInfoService.class deleted file mode 100644 index b089825bae17bc528a055f27e87bffa1191bf006..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 676 zcmbV~%}T>S5XWcxX{*)xdGHBZ1ot8+qzJtTg#?9&M`4?8(yjSoGim9odGG;zC~>x_ zHMTbolg-XB^Pl<6etx}w0Kg4gG~uiX=L}kz45f#|Fl2Dsvu9#1cqrn4yQozhSS8OW zMj1$L^$TB)D&)4x&|=VaBu^+prYb5#%v%r$vl z|ED*wy(HpU;v)}LEIBDCT=L;YZxs89bx&&q?*A7}R9EGUFLln*`ZAsT8zxcD z#BX8oYNA;aQ>+w5^R7)&5A#sRf*!3C+RJZ>oZ`k7bkl67aP^zH>V`j{_jYM(&(Siz n%vW-!p@KqBP6+h+3J2(m9yAI=(FsPP$D#)UBagySJ3RgZmoaNX diff --git a/target/classes/com/soft/line/service/CertificateInfoService.class b/target/classes/com/soft/line/service/CertificateInfoService.class deleted file mode 100644 index 0a37eb0a3bc3481972b30f7e5696aa738a80402d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1290 zcmb7EO>fgc5S>lZq-jeVQoc(0D)f*@2n&e=k}D({gk&j&h)CSG_Qu)DSzDWRrJVR* z9QXnJD8yUG)W!v24pF>2GjHBJzw!4UU%wI2D?0Ab(+)jjv>OUD5qcRb9=(ksM#qEk z1;6A@#8v1_jg~5OhwH1<$jBMXrEwYc&V-rA!GvqR5C#B@Hq)ihA8=&Uoyt&glWIJV zYXF{%{dnOlpk2S#d%WN{2 z*s@jxzc6yE!P?4Lkan5`@BpJNKTef7U5z|69ORgpQ$1xwD70I8OTWzPF=|NUH+@@W z4G;gEuDo}aB%`A;wY6!o1t_~cuH@8Jy0SO5hsLDSIMu#*FC&b7ShBg*ek$~(^u-Iy zlhO0vcL(pp2CK`H*I;vt^Z`vDO$AJU@& PWcv!_F>;^a)S#oE!D(Y- diff --git a/target/classes/com/soft/line/service/CodeDetailService.class b/target/classes/com/soft/line/service/CodeDetailService.class deleted file mode 100644 index 746cbed93cf5d33337cdfb93a20f0c17d768fa3a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 641 zcma)4%T5A85UfTXf~bhZgJ%=v;>5%Q3C4pMJ&2KH{ef|5amcc3W(Sh}H4lD(A7$)i zB|H;7ZFf&?O?B0LeSdrcxJ09bdI^Vwddva)?k4G3GtxGB;Dm60)*b4JR)G!&%5&C) zgZBEQ+4ZB5ilbMj0u!?0&>5GgPSodHcG?7OLhX^=Th#Aqt4HkE#)NHO0ME%g6Dnz$ zVF|~Xl1>ylVY*mW)cU8QHQ9v5Y{OL8jGa(T@1D1{MO3ElWW$}!%!aWuf$Eyr$%@_E7*^3oTiE9X#@Pf6wy7RsB(l~wf46kWxxP^KgWnv(2EnZv$N I)TY(J4<~rCBLDyZ diff --git a/target/classes/com/soft/line/service/ContractInfoService.class b/target/classes/com/soft/line/service/ContractInfoService.class deleted file mode 100644 index 362750c69e40bffb2bd934b66ab578dd1800a113..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1109 zcma)5O>5gg5S?`#J5JJkw@v!pOR+Cm0zDKI0&Yve;Isil?`vryZ&h8mZ%;68SN{!q5h1{~dqo;mwju%azo~QCn$m_?(eP zct#kvbGq|5L2N~+2rYxXC1gSGCxcH*!Mbqi=!%FU1|PaLkhw{lVWGam%3xjU85%p3 zGs|GVio%6Fwx;sQM-W}Io)&IqD@!BcxF3c|rWgDFd^3ppI{Hp)WY8^U`wb1W#TZR> zMa9y30|pIAgcm&W<6F7l)beZ2<$aY)?yS;jo*M(TR8v>=if8K!L0XTJ%!K$&DksI< z8*UFHG}ki3V~3DI&s~AiW3(Tad}OlX09^)8%8QnpxW#}JqRR)c)+Bd8lm1reZm}9P-q8s%j&(wjD1QS{8{}Jo)rx`4R}t~hrY=X QyeONLKwnbrD-ZegZ>6OzzW@LL diff --git a/target/classes/com/soft/line/service/LoginService.class b/target/classes/com/soft/line/service/LoginService.class deleted file mode 100644 index c0a11ee11f9da652eeb449b9da14c0ca1480704b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1019 zcmbtT$w~u35Uq}hSzP13okUO%+6To;f*^t*Bp3`HJa%R(V~3gU(9`YmYaaXnKT51j zg3CBL1P{Z|UG?hKt9t$Z@%jb;r?69mts-nQD7zRe*tb$EeyO8Kt6Pj+Xlo1>n`j@j-x5YdXwk$BrXtZNj;zIf>Tz~jP|nklTNRWI&GneWE_+G80`OnBGt4nd?4vNk(^m+YiB&Xk|8lx zlkK+AJW3Cb2Zm>```hP)9|ZZ&O!9Z~I1)1qwN5i&kfZkmP|B0pAy20QoeB)5=~tvL wmxRht0icu_m?g+4WiGjzhlMQEB4t;{hnBKK%Y<5i)uiwmtP?+jjiigsPppw5GXMYp diff --git a/target/classes/com/soft/line/service/MenuInfoService.class b/target/classes/com/soft/line/service/MenuInfoService.class deleted file mode 100644 index ee2cb9be9350548963498f82f85080c9177f132e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1230 zcma)5O;g)25M8B^5Fj+9K)=6ep~0=$TCy^wI2Ed z`lC8sNrt#!N^jEJ-M4S`R={UMGCyz5WS=sERr&0}v$ z)8Swe$i$1dp64fCN+ULBamti8!{b<-${~U7lnJ z?^lQqU7whW$n&-0A{thZUibRtk0bojeVxW=P=f z%@CJc!SbDQFho8YTVO;-Z%YlQyW0;77vvG`IL7W@LMzRXp?KJplwZ(R)JGj+}b z_SP&JZs6a%nG0TSZ<&nd+MTp}>V8I(0Q!#K7+`$~orWd6E#qw&*A=?Z!eawgFw}Mj66-72(cp&r~Tv)T>7EZDN}_EmVt!uR0;X1g8_k?;{bUi5fk dQ=VRjp271)mQ(VgLi7@ecB^+xeq|?o{RdnTMU?;m diff --git a/target/classes/com/soft/line/service/RoleInfoService.class b/target/classes/com/soft/line/service/RoleInfoService.class deleted file mode 100644 index 95b1abcca33ef63e731a53ed62e1ec377c8e3bf6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 826 zcma)4+e*Vg5S^{HH*dAxKR{?-Ttpv)l!7lpp;fWq`!*TVmF*^MHUk-4jqJ#?%QKt@KaNaId8;aQL zWMrYVlXT2u5#j_@jE3KnnXxfw4$)4c;9eLpMT;h3ur?JjgV!ap?wnf*9rBSiQion4 zayNdaM^krymCR`tf)ssf`JYvKnGThJq_!kuYpGYS^T^<8DfmxncXdq!0fR~!2g1>B z`BAE^)B2V~V$jZ+GcEesVu+?FMlMgMPaMV#j>u}xm|t&Bb5S>Ln1iui(5IZZe@fy1`6lgFepvI%IT$cqF?`|)9b0jqWFbjWxKgu}V zfdSzXW3k1&w=?r*-h6(&e*nNG)Cy27z!8I5h#XajN`!4~uChi!oUy3`FU^6IpC609eksIzwlqO`bk~%K;hn9mz`9pgN zd3YI1fp&AP-8^j}=Z{sIq_Vy`p){xlN^m4?CqhR)-bdc8(NWNv-pHUgQsJ}YhCwwZ z37V4$T3MvDroCw(6R^&`S)nKHztTJ_d#p4zEbeX%{Qr2hz6>@sE;%|fLbjDlgC09S zE<4gpl#mxQcNv@s?OCB7pyeuGT46$xF^i*^e@}K)*OBh?Tt8TzN`)Mi zmG*^yX+j2zH)y*$ZV4m$Xwl>hs)a+u1KfFy2Fd#C&rX zTBj%!`M4UB{X2rcV6{jW%3i$O5#7yfeF*n=HkHK$P3VkQ%}_Dh)`f}iQl>PHRoA*3 zRvXQujPS_a!QkNc+K|Q_e(%jtOxrWEG#FKt0p&_t2~aK5{Gm+W75b`>0{|)oFinDC tX@*W_=_$b+9nC{+q^^7Q0xXV7OTM%WD}Mo239tt1BlQMx8Eks`)+Y)i+J^uD diff --git a/target/classes/com/soft/line/service/impl/AppletCertificateServiceImpl.class b/target/classes/com/soft/line/service/impl/AppletCertificateServiceImpl.class deleted file mode 100644 index e8e589a7cfd16b92063a7fd22a0423f3e471de12..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9590 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 diff --git a/target/classes/com/soft/line/service/impl/AppletCommonServiceImpl.class b/target/classes/com/soft/line/service/impl/AppletCommonServiceImpl.class deleted file mode 100644 index 3bcfb438971e4a408ba23b91b77f08b96658d4de..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5850 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 diff --git a/target/classes/com/soft/line/service/impl/AppletContractServiceImpl.class b/target/classes/com/soft/line/service/impl/AppletContractServiceImpl.class deleted file mode 100644 index e468f42af7eec60a2f73580e5e65ed07488d69ea..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10591 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 bPeH8a(Vv3GVEj)ZbD^BeHz|?+2hkq^9WTH) diff --git a/target/classes/com/soft/line/service/impl/AttachmentInfoServiceImpl.class b/target/classes/com/soft/line/service/impl/AttachmentInfoServiceImpl.class deleted file mode 100644 index 463fb2b3194169a9947023113c6054fc7795f8d3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6150 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 diff --git a/target/classes/com/soft/line/service/impl/CertificateInfoServiceImpl.class b/target/classes/com/soft/line/service/impl/CertificateInfoServiceImpl.class deleted file mode 100644 index adcd84376f159449f15b50e3bffe9c18d0cdb6eb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5224 zcmcIn`FGUj6}_6VEi)sQnANmlu^r+y3dA%7yAWfS;>I?{19nIgh&-bi3y&o;qk*_v zx+dNCv`v?EOPlUZn$+OXrs;C}Lr?#m{?gO!K1rj|h$)z!Q+$v#pWgT0ecOGX{_?Na z-vBU(Kc#RliW|^{r8I0fDJ+caPTtjvmTl@w-nu^8NSbQeXDYU9Et#`c*_tn! zBew0hhHE)?S-}zC?sCbp3;B|AUq8s4`eWc<#SFMtnquOnT z>l)dGCDV4J;QAVa8)+a+B`w32ZMnx7hVGtO1x=$)&Q!2@f^JP!mgddUS%Z+h_+*XZ ztWmP$cd*#xE?D&8!I;IeS-N6nP2E~rF2;kB@!yT}6|HY7nC`S$Dm%7O94QtRbahW$ zGOieU(Xb18#+9fH_4rE_*DC50R@vpg)(UM*F{iMum&jA+{F1<{W>OUs765~%{3Js6ns(6fH%jnq!Tau+J| z`m#|l7tA7yN}uMVq>=iPtS8BV=UBLrUd76h>bFFMg4i^B#iL-~?G5diaH2_FS*|Ab za6~OZ58oW)$ja&YOJ>&fB5@?LPvG1^5Kr9(?j5LlIu`SF!oOW+?f^ksP!TmkV6Iwn zW|76nl8xaTlFmC4TU;+_ZcSw!63mH}(ea#u?m&;%LF2Y-3YA5&Rc)$q1qqAtTO;qP z;w-_e=t>$nUVFON*9zjr=2(d;IIzCWY*6Xxv(BPvE9i`E%3DQtv3{;9G3H92Y|N1V z7FnMj9jW++if=N^mE|1yT7hQSly_&$tWy$4qXG7MMF6*yg4az&)~kwdDHw_it~>Ff zP$-RLaAIYAOpGYlA64fwK&`Po915J6%zBgmzqecKaF(OXWBydesg$zjNlSQsZ-l;t zjxsgAzE5DYz#2}hGV^0PE-6G0whU=Fh(j9s(68bJ4M*^hif?Q94!*15IPwbi+?okx z|C1WNCztOduVE4|YS3}N0_Bj3A87a?UQ%#ZjsJuCRq-Pc{;`Ii;EaN1Be!JPDt@Zr zXZSg5M8hxeOBF9`cm==G@G4%@@N29xceTWfv4k{S!*vZ8u&QAVud_Hb+`w-%{1$I; zRMnpW8qWs}7e#T>%8>vf>Lu?Qeup;|9In^Hl3ma6RPlQaf50C#^q`k>pcVw5j(JFF zthaG~>ooWj!OE@I(4Yy)WwnrvvjhwtSQPZuZ{#?W2^X`>R`3o}2kM2rc^8|D=Q#S= z&t)DKI3>NQu3#Y6Gq;?qWDAws{f^vFCJ|?)OB-=9iE(4iDWYWh*wbXPz@W#h!O#oN zCebAlX1zy&`;87@F}e=8xd9{h5Y=vv<|9!g$K*!roJaeyY7BC9%5|4#%*z$C>;^HU zCn1X}xTo76dbOi$gCsL{>0p~Mf&?PID=2=^EFvC@b6ZD!AR0;4bo=rWNcU(e9n`;AnZsGktZ;i|wTTAmdIiA-CD53MN z@ZQ{e4azItmO)-c0jT;gubMA_x8Xtl;-Lo*(X4DfPNNCl)4i`D(YJoTM2m=9ziFoqE>=kA*?RU;ZfR7vZJLV65M$=&f_tzyqntC ztN+AS6_2ZUq8gkz5AB5z?TeHZwEBNT+jj%I&R;|ODs~6J-%1FhUXO*Lm|euhRf z1b&XdX9;|cMDl0^ydHwrL-73}`0jOqzlbMkO)~m7-dlLjGy=bdw~`y0+MCvJw}R(! zzdY?xSay4lHn%rRCfb|poojDi!#;ZV(!c*InQ8J!p%*DWKTcCm(7_9I@FE>F$b$2v zv@DxHhtn|Wdfsz%ko|X%eP_^dp_5GLa)vv`ynIcEE>8q5*Q!~h#wjHk+=gVB!GAzi zk^MWh1$9180iQT>6gO$!k4lAisq>v)zS{N&&DODoPO?XTjqXyc7~m4NV=+?pJ43uX zgHGE{IYFNAh|OnXc_%&RzY}7+srw47jD>Ji?5D8&+tAi^9rwJ70}^2+!u9RcVR0=% KMAa#@2>b`@#TgF( diff --git a/target/classes/com/soft/line/service/impl/CodeDetailServiceImpl.class b/target/classes/com/soft/line/service/impl/CodeDetailServiceImpl.class deleted file mode 100644 index 6aa571bf6a99c5aca56c72ee493bab094ebf4777..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1733 zcmbVMZBG+H5PtRwl(vT;A_%_mDlH%jh>Fr+5Q9;R5+QuwmTg(Q-ZghyNdJ{a6U7hy z0DqKm_O3u_OEBh=+ug~`Jo7v=yTAYZ`~_ec*(8#fO(2fB6dq#U{J8lonBQU?OG!M! zvT=AE$CEgoGQ=FO#L%Df{1OkG;_@NSd8Lx{R~h;W-oAV#wNTEMs8poSFr6!SWgd7% z%^l@RUJmViqsftihd)+bt;%vw1uE~zb=UQ@(8_ZIhLs4d;w!gQ^hH@7d;TY$m%
F)|c3kem3vnPCI z&UIslK2QX|)I=hX{*fw3uF4gsfyz!~enVCQ?hm9R3;Jbk+gD}b*WSq*!|QbJP#g*F z2)D#{wBfVbYRNR=NfJia8jvV`x6yjHRtZaQ$;psB?*%nxOX>q}e_I&swDgJ7NL1d2 z=W0s7c(Kfte=M^N?!YN+BlKx@2HTW#e(Y=Xidamx!OTS3RJC$=P6e8HCw5fH6}svZ z@pfu9hh(qRa?PljEzo#|bCTTgs(wLkDl-)$hD9{d4c(nLycyDMr!pXYrKhPgydJV@ zqaQbHTtjahD>jBPV>WZH$@S1ST04E?$$XCoGOwDXF6@FzWQEIDgmNZ#2*3w)$(p;)_WKfz=$a+oZWT8%zwS{hqEjwx*DV61R zfx&={`~5OtT*hrME(1C?(t3r#CqD4-@9>3(+j}J0mL0G4C!Rc!te?*BocFxv_S4_~ z^TwM1Ch_M49>8h>7A|kY5UwOqz?up>fp$1@S(lZoa&bkV*a@!_my#&qnu_a5JcW%; zd^mxR;OPWDijO7m3_hN~9(+Rfd{V`;3G|7DJ$O!5K9$4(KAps8@L9QhPQ~YC`3rLS zVkf?&;>+^$D=NO4z}N6~G5QS^-&FCuf_TBnE9g!+ZeA}Ia+89nbJA z$1W;399Ud;EjyocjWzSS<6hBMOv5hfIofpG4c(}2&}T}XbKP>yEY zwdliSgTKI7}FJ`$e`17VWQz*==I3=&b8?_x8NnJLs8G6aH3OebY z3aHLo-fC$@UpMmRs##zR^acKukWf{e^b6|xjS9Llrt4WbD`R-RDAjjGgi=<~fK~D#d1;ftkX-|SX6NLV)IJxMGD zJyCM})E7rOTr=aibiJ)WDHY#oV6pY26m7dR4trfCUXN_dW@qed;PFUk-gkM{_Dt!n zTUj_Ts~~0(Pfz4sMLfcLpmax&AT)G5aB?8(WY9foO~H3sL7_pW)hr1B`F*K%Rv7i^ z3`d0DWD{wpO+HOV?WCK>@5_r0HZRG6_t_W8=}oEmImE#324!8D-FNKD;j=--)i_BZYbDM3&e3|r-oPYdkyDs zL&Ix$otdZM57^Xj6Sou$)Q{IDZBRp5wtf&FV)0s8Hm-;PiI0Xia9hDc^_o}@cO6bD z{;1(kcvHg&4sc}D+z&c8$A5FBO(I&iJs1UBylYb1><~4&W*KyYM*;Sydb@ruHjKn` zoSUqZqUp(i^c%Z^iH4NF<4|Q^c}Kk+j#rtuQTJF|{y|8kp`i4(71^3IGSZuMXO{K$ znn&EtsIhqcmfOfL(QR4U!g+|P*|~7|nKBsw9+e)?ZL?Z{tz_WN_T( z7-r0Z)4#+yLh7-CQ7lqdfefQRueJ}K<CA$t4xAqEWcI)p9^)53o2r7L1*G|&~=p;o*H zM`*8$e^Z#IgZ)tPUL2*a_fdWy?}60&t5P#nsYm$s7~i)mR0AC6e+(xmc=FEhJMRvE zjPS<^YJz|c62AWbgntUB>6x&9m3+l`9}0=z7K6kf(VZOY*2>r(!(XtYjGb{TOJIWl z?C?pOM3OWQGN3|yU!bN+{7^`|kQ@YGR)pj&gwAsD3?8KdLG(QDk`Ke(U30f^&-}z+ zk(}5>_a=Jg#+V7aLZrP!T7$HgQ3WF%XOvaOImsCJFv7cOatJdKa)+xBhmpb@ZO2&( z^LUJQReqN*-~(JaOKnLg|3;6Bw2H+F>J--%9snw6U!ts_)!z#3*lqNkzlnP{u{#9b zUk7{;o!owcYEIJpDH=UZ;AaT@Q36jfH|8SX^(uJ13Vyr_exxPvOIW5gq52=ZckrHW z2EL5@6dY;mZ!6<%3SPj2^6P$u`LO3mdw;t`qQAY~x&HPt_R_nT|ND1|Oq*Y=qe$>~ zz$v+;gNt-{xGzHC%*LWFkkK+|S$9#8! zruKvnHE14M6`+Poc!IhliSrBJWapy}p_5ePOW;lrb1X zt=R?kvcA2b#(JyvdbiY=tTe5$4AU%IZP)`oNJ8r#x`pA_uwTNZMEu)LXeQTU$W>=S G9{3*!1jj%C diff --git a/target/classes/com/soft/line/service/impl/LoginServiceImpl.class b/target/classes/com/soft/line/service/impl/LoginServiceImpl.class deleted file mode 100644 index 689df8c7e1c62a5310ce88473628633b247fa00f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12041 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 Z`IwRI?ep<)=;SB#G;Dp1HTpBr{{aHHN^}4K diff --git a/target/classes/com/soft/line/service/impl/MenuInfoServiceImpl.class b/target/classes/com/soft/line/service/impl/MenuInfoServiceImpl.class deleted file mode 100644 index ba6decffac18ffcce3cf3e7cc2cfd8b964db61ca..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6983 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 i$?`7}-*65aAIG%{{=Lr)J77hF(5 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 Uw!p*-v=*T=GJd*QZaxG24@I>7&j0`b diff --git a/target/classes/com/soft/line/util/MP/AjaxResult$Type.class b/target/classes/com/soft/line/util/MP/AjaxResult$Type.class deleted file mode 100644 index 79890bc60cbdb3401fd93d4f4617736d5136fb13..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1594 zcma)5QF9t)6g?lXK(?C%uqCBZn<}+HY@nK|l^CH&Ee=gOY#S%ziyN{{H?vusW$Dy6 zAN?^tC{^p|==9O?_vowRxgQxzMrUMa_FgXEx#ymH@3+7I_0z8aHt_KR47?-eT@yF) zUJAt&Hce#lzL>2vawZQy5JWSLy!cicE8=gZabA2og%1@{_Jel2W7`Ue`(J$SDp=hh zaKpCmj7IKA;c9O%Jg$v~52Kpz1#WE|d4BEgy;|$YdD3@BV?QcMUW56cwEEi$$?ct6 zt!*+Joqm6(Pyg8Q$0Sx=Rx9ncdJj6RR{nHu;-n^^mTI{&e^#PBJYd!39#wCTkN4g1 zzO(Q1pOmKCd8p7R_l}&$PR)0M!)S3%qDcVdX!hbi0*Zjx~DZ5owm(V0>Jf(l1VfVR+yLj<2v_ zdxwD&jYF1BlyzFXT;aS;XE1O_qf)(Im+{Tnn`FkGFeAM=;L^1~@=?sqnZ7#IvpFZ@ z7Vn2?569uaz3s^omS5bTb=iT10xnp1S?+PsLI<}~_(pHnNDBZxyU?DEXwP1V$jP{X%mta4WMBao@d^|!F?y9=9&>`& z4~RcU;u}V6i8iUvio{;-$8w?0jsprM%Q(Psc>UjA(LiGeV*jvspRWgUK(%W zt&`-hxG#A=`x(YwE*;O}w`W**3RA~t5?OUk$Ci#4jjZ}p$4fe1PG;2~I?kkiAwhh? zPh>AKfo1O*6D-+#$q6#{Q^aI^)9vMT#Y@O=d#hAe=O&uG0r8W`Y~Tj5F}#hl^d_?m JH1JZh@Hc+(MmGQe diff --git a/target/classes/com/soft/line/util/MP/AjaxResult.class b/target/classes/com/soft/line/util/MP/AjaxResult.class deleted file mode 100644 index 05dccff36caf99596dcf4a175f407221e45eb36f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3341 zcmbVP-E$LF6#w1kW0R0lNLvuliU>AMffOvI*b1acX;ad)HvIsC1E;%r$TrbGa=+K%f`6?4h1k6z!p16bmT!oyj%6arZ0Ns%Wj{B}-4Ny4gtclP3%A`niis!~pt zWL;NuflaznF3P2OrK}ehVEmKsLY-M#( zDbLD_C9*^^TAsMb#E9m$(Q7OhiRi9OUR#ap+F2uBqIL0#Q7pwLr{jqg`NE8%S4sx$ zJ{)c8wVTs0bSHI_m|>=<`yN3ko>jd-Ih<6CWo>C%F3YQmL75cD-aio+wW-AwC2tIw z)RtsJzCGvmS1MM{kn`szyCUxYEnXk%=DjqSmkAAkAhwGVE5{ZSZc z{`9)F$3cP3W?OLQMqp2~fXrh_N2$K0+-9;A&*d~Vy}PfkPat-$N3AD)i<{Z9(yE~p z6cT{6&OL7GtiYCNy2n*U+k$Ki!qCIkR$>eA*C(zY66DiqH z=BTAnyamO`YUf$FIVG>L2B~dQPu^I|O-56x@3coJ+;rJUT)hj4nJmeBbY^C1h6w+z0W>yx1!#0CYXfeZf z-<`p}pRgeo3GBPY#sdy=JNz_G(BhNCCPVW{%5fHtVcKLBvtS)o-43g6n-y(}K^!3h zPY_Zk#J{xID`7~&u!JWi3Kb^xR*yq{kW4{7$rK+au*-}S@JE7GguWq*FxmM{`zg~m zVTXEvo?I;{5{y-`ft_1i&a$gkl1a?k-ACdlSKf8RM(VSX{4vo0=$s44Z^r5XarPM~ zX#*wTqc@=S8d^?&i*T&>Dq8D_t($mTEJquUmY5Xj&SJ{5W5OMj!S+nA8?(0_ z^BoHAUDC#TF8&>MVtqEc#otNsiN-1Js6ktW{m`LFrEipCYT`EIx)gUdOz~$fimlC4 zJm#dhroSy!Y-O5m{e4Bnrn|#ta+_)%s1NB%vykZiX&lnFh9Uj<|3VsfLK?GG(;4BA zn&{>_rT=HN;}?g$-=&*zCw8}Pwl>ktucVvbNH@Q`BIvM-a))lL6P0$@*9x+|iXHU@ z`Ga~h-Pm>>2kc10*6DkYTHr(VW%=6)jQjWmwNvLXPtdD}x*xZZ40S(#X6dfs3qa6M KkQVGbzU@D#<8Rvl diff --git a/target/classes/com/soft/line/util/MP/DateUtil.class b/target/classes/com/soft/line/util/MP/DateUtil.class deleted file mode 100644 index 49d4624ef00e3306ec5894b2bfd5983ea5d6c843..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2024 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 diff --git a/target/classes/com/soft/line/util/WebToolUtils.class b/target/classes/com/soft/line/util/WebToolUtils.class deleted file mode 100644 index a48e72ed416daf3ecebabff1f1e89cb9ba11d6fa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2628 zcmah~?Nd}$82_E!W$&_F1y%tUHPX@mg#{xuFbffrSYDJD(=xj(2e`7_yYAiPSfZ5JDBNDXlm4c=PoQOGUM#*z2`jVd4A`4e$UJO^TFNU z0W{&eAgXa7i05!Hh;sC)N59$*1TYxHA-o>MVH^qI4fTFg9Ul$gtsqKptO#$zP>&%E zF(nxeKq|G707lh*OoOQ`jw|7K0Pz4O0dQPYy$>4_nk>^Fwul!T&o%!m&fNmK3T zg+6D@ObKj=#_Wkm${ukdaoR=Fjv0>}l0*Hr9UtI2)gllam5vM1(JQdJx+Z$uIB7)U zhBX@LbCRYtN}Uybju9L0G7|If!S<<`OgN@(r8K-NP-LbKnbxp9nd<3t9X=u;`1jkX zZezlA@-b8mrv*wDF5hpboUCfG5}8(dD(h52pwLVh!^26LVnjs@!)aaEm1mu$DAKVg zS3yZDJ<*X+iUJi`EjRdf%4O0}u2aotTF!{T+C`Xd=}g+m@ea$8$q^$am6GL#;E|Sq zM@|V;E~@w0v2p3-*r2w@q{rot=HygjAuo~TUD>sWm>jLChbs+H3G+}Ep==%_)hju)_9$9s5R$5}M$*o8&`%}&*;&^4UXaULHqVLCo^ zPbRa;*6|TO)^S0}pyMJg@nRjHD6miQnLyahx=PPdCv|+Tto*}@z@(1LxI*sYwvI1w ziFKGW%;Q7HRfT*_8G4$VnVE*>2K5?|I~#O-iLW$#t>Zer5m=K0Sdt=Q|9$!P+?DHQ zV($ByxtnL_?wy~Ton@6ZZrf4cz#rrP7PTxJ7b33__N2}Duq3D6j^1V+H!v+w^@Ijv zi7&$R3>}v-M__%UbEQnt9j|t@?fWj7eZMYG-D|qGg4i4QnttCgtQzr7c4pD%x{;Du`KO0)6`9F zGY4X}M)3Jn7igUm$OBu(1v8&;Z;r=A&5?jYeB&0PgP?sOT z{K$ShP4mUuf(`uERr6B_6hNr%=W`2p5x&{RD5$*+@e3CoY~|DM3JX!kwVqW#J(Yn% zG@y}M%DCA*0ZM1#xq;v;yczgrW>GN1!z|EBcwGoTR`6GhZQOYwR^WLq{8VbJFO9p{ZVFp3Zk0|i9RQ}{5C@0Gq3l*tei2&B34C_!qIOTM? z3sXVh9oz*_ik*0oSE&07A?~9>X!O4jExBl_=A+TvIEqvZB9DwsuFF2knh;d8k~h#{ z@fYLKsCzG@cg|u(bjuyA6dV)hxF{C*10`KsGbrt@3xzURHI0$F&}w&al;W~xU)VQq z(4|(cMR{{UxFCayX>3<-Uj}QM{b7G7?AmSQs?uGp;cBhBS{e3t{)%;Be+KJsJ^cCB z!_&90DoRPHijvUNon&zXx4&WI;oEp7^lS#3YWdG#GtX;h7?qdP_$t}+xiJrtO;sIU z##utvDj9thBX1<5txQ%Ic^x39$H?j#5_y(HUc_#G0A3+ZJCRyBviD#bZMccO_yPNH z7q7axImmn*V-3DUTR)LnX!kO6xdZ*QZlwp6I6>PsGF-)i*h@Xd@de_x($j0KqkY6u zKHtH9o&p{GtDI*sUL!_Uzmr-j=bND2hsKm^h(16>LsxeFAA0|R=U;gCXy`7^rT8hD K_0Y_N-v0rVw0&{_ diff --git a/target/classes/com/soft/line/util/config/Swagger2Config.class b/target/classes/com/soft/line/util/config/Swagger2Config.class deleted file mode 100644 index 682055f28e9a3c63c34cd71b191eb01df22cf9d2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2475 zcmbVOZBrXn6n>Vs4Pi@5uodW=eWL*+H$k8U+FGELR%1azsc3E8Y;KYZo87Q`L)w4f zC;jMWr{jzt)eoT~GyVYoM;(8Kzu7P^+72mi8stPeVwC@L3pV@JO95gs`aQ&(*M`Bc)?mL)$Ik2zf_Cb97)uL(8n2;TldR zg~K0}3Tf^wn`xU)B1zXW?G@7#YF|5Sk$K^37))Ajf%$G$GMnsJNeY`;u9FoxmMWXM z9QQ_MgYA@t6PCwK$(Ohs*qb-ldWwMS-sfUl5{c$8oDx1ZX(vdbyf))-wyd?0V}8k>oEVGk34D8E!h{ zOE-(+p_6qr3>}7sdz-@Ij9{zFWEW1kCC}pbg<`1t?NDQD=BBA({9U0`2`YI(q&p6PgQ;2W4a(grMK3~-nRvKY{?laPIBPM3t8;hw+4>`ZlEr}VGy zetPr$t2f{N@b`~D8^|F~bz40%Ak^+!UdrMmW40>Nyz9%!i9|fk{3=t!B@xTZf^A?; zUB2Fslv;u*71FdM^@P1dEx{ z{M^#>5hA~FIUQt71vnBtris#zXNMU5r+xlk+qe1L4#=23tWyI$c}q8_X;Xov>($DO zLcH0C(A|n$;u|GWst2Z%p(@|;KoZlDHhsQmTI*(xm>!QN>*-2KrDjtDfhy))H)nIw zoFV5p+#U&~rqcCfcVxJ4d7`L(Su}J>?iKunY^qw7 zk3Cz%!~rku&+GmZRrtEn!ay{h9^C>pfuRyPei-^DDJ6wKI&+b}A=FmUZEYM zS);jia0}Y6v}nRr8ry=y)3`=!qj~}TxK2BgB@EClWt<6|0sY%(TKx^pTWBFStrfIY zphrTl(OyCLH99IVDmd{ASya9Ek$<2E9q2_D`skbEEY8vYWt`vhVt?($LAtB(3-_?PNGoC<^i2^&RD^l~MeuQ(u60YAmCaWCEuRDhefOip z*;;8;ECw>S%$zfG^7j7p0$>x19x|AAFykSCS!?DT%sW_M$ZX3_H}Hq$M77@;`# z*+71jG8bdWQx08Hp}M< O=wp>BWSAtIz|;qZ?wg1J diff --git a/target/classes/com/soft/line/util/exception/CommonResult.class b/target/classes/com/soft/line/util/exception/CommonResult.class deleted file mode 100644 index 4eed1f72c7330f84270d44ece0ecc23fd15a781d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5806 zcmcIn>vJ1d75}ZY(n|I^aa7BxXrK;FiY(c2DS;N*apL$v-1?FD)yA|mYk6ZUktIi# zQYSnLltK%H_p|Vse8~ss5EtkS17FGve-owr&b_r`?^rykmWU5zA4AQ zB^%$Cg=f3)x=`Pd>7Av z;+k{Q=_@*=mA>&()m?Eb{RYBo8!HA9fxX#krBGVoRq8mwy^mgX3PpF>z(RU&564F< zm2yS;=padAw&SjU(7*%I8?a&E#x9ZnKiu@QvAX{xJXH3Xme(IPyoYkY54hnneXLep z+%1ke3?5vs?_O{E0Ufgggf8sj%mK9crVrh8iiKsT>W+CA#IBW`8eyqYxGnc3ezja# zDl9L%C4$q6Th$1gq{H>VeNZN7Q({s^Ku3dsmlksM9S4ww?fS_J5K0P z*rIseM@(&~F&Ni;MYk%pKLTyNqFzKai2Z(KcIk^4BMwbv4QOEKrj$%{t-x5v!JU@(kpH8TE4>D7ly904I>r z?EVhR9Ae(-AlG#Bmj0*#11+=VS|#s}5zq}B31;V%^rVe$lx!Twr)@le6GY?ue&@S| zpV;^*erDrKxM1VwcutfRE&Rg9FNOU@A}*mNy&xBYp&x3T(wV;o~c;}fGJ1`aO_O^lBW z&5gd|bL{!4q4~KB(=+3XA`l;&o;g20GBP^FQ_lLjTO$7S27AfB+JUZUNGiQ-koS9X zS9x}c$;U4cMo2n_R7jde{j#uNS{0q<`h`|qd zv437!{DNn3ffhsDYp+|(HZ#_%jCE>R&lpeP83t(t%(e&2GDtD|%(m%gX_|M=GkrD~ zZ04_s8{pc)YvBbOQmNO$KHCs%KL)7O3$1@!{~4u!(9=H>3{C6LHd8&)5Smt956!EV z7^w$xRv9|y8OnKqcsXok)iTWtO$TDoncI$`u6jtRKF>r;V?M4b4Os7>^)Ilc1&lye z7QLDd^Uw&I9BONFXu09gEI7DRc!L5%L!)rVA9b8Xtyw*&eQ*wtgZSv;&Pa&2ny zjgM>5kh#KoNTG)KE0;Wy`7=U0Z)$tMLd3(0`b`y%;DRB;rir@nPIX82sg7gIYonld z?K{;a_N7h(=Oq1`!nCJW)C+h-6=c@YQeRnH>D7=C-A2f$hmiI7WzWY&BGqxCih+x` z)XYc#lJ_lY9w`z@JxYm$8Bs83_z-oH=5zw*=oKFp zIyPgDzj2D+$!7k5hG9@MTgFOyV3~A{9lEC4QNdg$f?S zS4hRw0MR+T<8_19`wI15p+8yJR_s4GWWo6Wofek(FJ^pzM>QD_l77-(VA4%_%IReD z6=#s*6_qSYkilUZY*zn@Qk0=R+0aM+W%Xvyi>iQL3JA?;kMFsInbv z?_XunV(r-y2V}NK%+VK47kqiUel&yqEeb4B%BnKctAsgc}Bv48!=4 z3hLh>VI&dp1$-H^k>!a+17dZ_om>jjalVLkHnC3U1yoPJhohI@#iNPT7Cs?K-NIvu zW18;ZPvVoBP7421q_^<+PL$IH)~}`0Ub5;KBpkW9@+d4aPJ#4IT34^W#z$eM_dY&? z5N!(UGFsl#F7HKogh~V*>KQ8C*TJGlDe9=v;n~)EY3@mLwS^TD3Q*P2V@)|&;@UWK X_-fsWS%>z8>LCx7%FMMqmT&wIK4_65 diff --git a/target/classes/com/soft/line/util/exception/GlobalException.class b/target/classes/com/soft/line/util/exception/GlobalException.class deleted file mode 100644 index eaa3b6c14b4c0955c5b503e8a397621d16663be5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1180 zcmb7?PjAye5XIlRiA_?|gp#x&w2(ldsZ-S#ZbiMIf-0p5(W>`Nx+Ja~8#xZ}u|NV< zaNq;*p%8Cv=Z`{(#ASAOH1m6J#{TvD$4>yy&?>;h_9`CWVG$M@Iy7~7WZ|)e9f5+1 zqA+?9UMhjTPA?p~qwrnq`d*;iaqRi7`qWeJV=oNcljBM0p@7|2@$@awZv9VlF4Ze_ zsPcL|?5gNoc6~Zn?}R<+U&zSQ?<|>%2i{2FV7a?je%O`%@x(1Hn$Nw!i;o2MTgzML z2HU$3D4(i$5MI8KksPX6MbxggI#=?8bbT50-Lp9Ig8rc{wT5amlKsT_Uj+iS`L^>x z6n@lWC7t=69FN#nodeG*1f2QSO!3B2ZKHS=j-#G>>FFI-7B+F9joG+`f`unGo?_R= z9aMDK)S=D=E&c8bJc0Ub)VJdx_J(S@c7ffctl6sRn!nKLWPcU@Kr?JMFq-^*E&j;@ zh8}>oJnu!UGTMB(JcZ6WUm-s8V&FETnIubC=;;BVUr%nD0T}-ky z&U0@LYfiByc+Z*T^q&8{BL& e;WpB;sa-3x%T{OwBQahumF^o= diff --git a/target/classes/com/soft/line/util/exception/IErrorCode.class b/target/classes/com/soft/line/util/exception/IErrorCode.class deleted file mode 100644 index c8e3f24655e70a5354ba1b873204ca5cb9f41600..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 216 zcmY+;F$%&k7zN;$T3fAy4tfT4F^ij{C=?Wjo}kv>kP;I~Q}JvL9>7D1$yA&kJU$-p z^L@PmtT9S4Op!69g51_zh+(!^9_sQ@a#d=7QtwYr!3nHXI(25Ha|+3AG%iB z4o{nzY|0%?FPH-oyyGL$SY%8>{oF__IyN#BdB2Qkvy&sUGsmZ$Qdu-J86!#hK!sj+9m`I#x|=f1MySrvsofNM z-biK5jD)^m?{55LZj{=K5fhWy#d*`2G3HZ*C?eq083{*&|E+U390p?Pgpryv9E&5D z!ppX?NLd;tO!sVh;e_GP)ioVzz&mK!mOCV2V28ZXic-pyRzM{dd*^5d?pceX`MOOz zyVzaKR$IKJodwG_QZzH&O4^2-b*PeHWwu9$R+6UJ4++h|-iqvHFUm?56Xh{CZ8Lf> zXmv0_>nA#`4syi{6`>+j^x$KUe`w&*rqPJwq@B`A`}B0yNtojnPq}_;+Yj-wYIv4E z#U2gsATFWjF~1ZIeK@J%FivUc!qXbM@r;7g48JQuD_p(&*T!<;(v|$@-?P>88rt#H z14aI)Tla4Ntf7OkKz`|B;o8l@j~DLW_@b=Y$C}QE7?37M3Y=r-)F<{ZLr`Z1dZ-{3k1g?>@eN{fdVDtf|}j9+}|(>u-xT37$kM zZ4+VJhdDKW&P=%U)gGzbp3#(%$qZCXv%HoS5a%bqmP)^pS(KN-zg22!t=Kra)4B~G zrvJG%NO%(Ja4RzlkR&#RB<_SHZiFNz=?o$-WN+E?KX9lQf2)GFVBdW+Cv&;Yd#G*L0l*n<}Mu@{`6lYGe& zFNkLO#O)R_Zdevc{WAI+fFtyDk$E>gFVa(mm#Ds%@d~}Ut1wCK$`iT`<>7|fM80A} zo>D#uuVP>aXZ2y{jvbs;4B}|Xd7T>L-_kndc%Y`*k3ZIk+&!z%R!}RzI@vG%&0xI% z8wBY0_@%EH3<$7MfK6V%^d*DM0&EfBUd1n6W$+0BwyGPHsXB*RJuc_apvOHqH0p70 r4lR0I$)QzWfyDe5m!M4)=o9RRXsoZH7Bi@W1(j$lk~u^ulREq_Cw1%q diff --git a/target/classes/com/soft/line/util/exception/ResultData.class b/target/classes/com/soft/line/util/exception/ResultData.class deleted file mode 100644 index 71481089a7f3f0d4324667c0dc04a488b4980269..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1347 zcma))-A)rh7>3{JZnsd2{8*}j3Mj~S`B?~@X*hwH)D$&ViKk0h%aZM`=}wLD3XFH) zJ$Rsr#KZ$Hz*FzX_|EKFXeo&YJKyZgH}Cg+KfnI`_z7Seo1@6XQOk;2R*SH(R=|1z zZUGwt6N%pmyzs#9Btaa#tnCSi#{y%!ag<0ek_TSc_4BW+-yc7G+T0hgcq+RIy=nqR zJ820_)la;)o*Q~m%WcR`5Val%m`9%U`tP0|p7>44yU~^}8<~t@S1Dxf#z(%ucs+>x zC*Ag;-+AF3hCG?7$4%0CWaNK#Xv*V&1l4*oZo5hRTDl?Mxm_8AuK%v-zmZJEeeNgS zQ0@^!g-p&uns%*vz|8l3c^n@-^EzJJm&~8Z5o}+jRJNP z#xYUCB&JGO!m_~fe^!vyI_q&7m?`R`Aa)yigo5{~MOfgJSzsw(Vg@4^<-W*K%;5?@ zLg+m?v?U7d2z{=h%ypW7F0G)=JKrEaYqttlB?>;f&b5>};0A8;PcYCd#ns~-+8nLr z%$`DglmiJuD7mG6tEdWO6QHQZ4H-O=`d;+|Oh~ zT9f4|JKteCYo{=DADq>`#4D5s*66v;`EXhI4fcOi2XxZ+y~dQY#!ypDFZI<)y7~vRoE2z`HXS6w45qlnINL*uWb5`;{{p`0*0KNq diff --git a/target/classes/com/soft/line/util/generator/mybatis-generator.xml b/target/classes/com/soft/line/util/generator/mybatis-generator.xml deleted file mode 100644 index 529a974..0000000 --- a/target/classes/com/soft/line/util/generator/mybatis-generator.xml +++ /dev/null @@ -1,95 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - \ No newline at end of file diff --git a/target/classes/com/soft/line/util/jackson/converter/ConverterConfig.class b/target/classes/com/soft/line/util/jackson/converter/ConverterConfig.class deleted file mode 100644 index c9864b32635f9d67d81d58ac6c7ff5052e556208..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1391 zcmcIkZEF)j5S~r0NqUVo*3>q>RI7ey1znILV$y=P2trUWB_N2hIXCB~mtEQ0tNtwg zR8a5-_@l(xy<9x=0vsUyf!jVT!bTac`%tj#n?97R zy;+7^1WGL-h1nxe+}iFE@b=X^PGGq$B!8X^dt4u~UWAdAwhCC(Wm?$tDCn8@A|~*l z9jGCVRo~DEaWpX^q5~Ej#Y)mZ$z!e!*K|Mg(CLe?NnkZLTFCHF9WcYkp9wtN+HNZy z()fe@+}CW#KPr8MT$*QunavX;V@4w;L)vi_Hq(e}%+}i6 zL#f8gL>e*VT@eeM$zv&%VMZv4Be^@Lerfn8L)kc$KH*Fv*LpUIXP6Okog2p6f8B-a zYoy~ES$LeEcbZ|rN*=w-tHG3DPW|^WA?Jl8N z1s|3OJUZ2Grq?{Rh`VP3Pv2eZO!%qs@0(dE=(6|GgdgqFbCEKUzO7bZCyb2-;1I2*G#OUPNC1B4>^z`E2(hC?5 z#w4Ao>-YB`0CuqEqlHI4mhsrb6CX_%pL$sFu*%TtsYKab zhWh%(F+*ctpGbz;P$lyHWIT}ONDN}C%!N7<@v$(<^jl%&ep&4@cm;&v`Fc1K7lOwk85Z#FMqbJ^9g_&H zR8LHlHFXWn5WJK2OrIPIBgT^6r3PPAbw3P7GP0#^_Eb?~X!q4H5q4roJg)Ro077ks zJpJTsoI3T-+MJU?BTJWMB)5MZ_9{C02)fgjcFC0A&rBUCH|^#B&g!Le+rb^QJv{4R z76G}Po&dv}+yBNtdbw$ao!hu(cy;48KGNP`jTW>8+6r3UIz@6zr%xHD$S5{9ufV?2 zrG~q7IxuJ$9XdNX0QWFM8SOCwLOJql%4!swTi;OoLYFFeJ|i#YfPzd=+{YZz<{gbu qf?$sn7YfB~icYb;x%CtEOEjict1Yz))lw^P4Lr!&Sj59DF8u+8Zti0M diff --git a/target/classes/com/soft/line/util/jackson/converter/StringToDateUtil.class b/target/classes/com/soft/line/util/jackson/converter/StringToDateUtil.class deleted file mode 100644 index b872e069ad06f1336bd2e7a244c95d1325616e0c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2157 zcmbVNS#J|p6#j0!j59b8l9(+(Q=n}UFm73klduz#U?+e>z$~Q`d*V!(#f--(ba`rD zBlWGSRJB#Bir2K264VHI@6V_z#Gh!>?_QhOL3ygBxpVG!&vw6a&iK!N|9B4I7{1W) zHb!)eVob*sWaN_7F^&njT$RhU2sQZ&z0z=9hmM?v$yW5>hK}u+(r{D5Ee&}cTQL&D zZTY?4U=gymcVEUb4yeWO9s|Xnw<#3 zi6(Z;*a%;rN~x~!2Zu&qf`W>>@MB3kjPenD}jNN>Ip)0(jj z)<@hHXv+m8DQlD!of>8}SQ;kT6dLxcD&J)OSu>dRip<4uOwvfcV}k|qtg5ExRIFi3 z)+q5N!-r-3I1b<)4RdikfXxVTIB?_eP-et99>R~Kf*_76<^?vZl-Jmj#-9juHZHQp zM;!aGKaNK@B(OuBZ$O&BzJ}?jZJQ;-KIfOJj_C$#p4guarP>|NS1r3}`i%Vd(}h=G zK6~}#=a=7q{qmb%UVisOI*!NqG>*^YH4fl&fv!gQMkQFw2As2;vTZgWCLZ&b%x06t zV$aA(+HumAN;=1Y8{n+Mn<%Td4q|II_H69>M&S7Wnhi#5P%<$+XBL9jwNdRPdwiWv zjW*7a=a*7O*(l7K96iVJ+)7GX9IX$P96Yv=W>wA;ejw1@Ja`vo4L@f-teS4Y9Oz?< zhB>ni3GS`W;`&~W+Vx4~$Ah!jT9yM-OD)mtwwByL-xveW8+O&4m?6=6u zW>Zo}eUfMqrXIgc5#^lIWt7XNTNFrc6rpLV*EJHyG8TBRN!l>EDSo$m_yDY>>}~ml zrp)Q#`Yv}Vz6IZr{$+??DYW1{u2BWF=#l>Yn)VCoz&~bAUPUB5@&DjcX|5I($qjlJ3%DC#56~ldf*Ep2GXg31uM|JFD)|qHM22YyAiNg@&P3w1Mx_ayhfg`$f6Y zaF*M1g4JB*pQzRhX*e%+FRU_VsD8kj<09il1OtP0ytLL7mP!b?)*gL^?fK9OcH}#D wE@M|NA69a=k|Rpqt>mbZ_b6FY@?Is!l>C;Ie@B~aFo8yc?d5KmSPL%y2m2%m%m4rY diff --git a/target/classes/com/soft/line/util/jackson/converter/StringToDoubleConverter.class b/target/classes/com/soft/line/util/jackson/converter/StringToDoubleConverter.class deleted file mode 100644 index a035b532a0adb7a3f3eebc4fa2efbab9527b5c2f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 958 zcmbtS%We}f6g|#s$PnnXK+B^%xu2n_@PW=1`1N%B;jX5$TaI%Edm}vZpF%7{-a7@m!x+o)V82 zR;7F@lCxZAJki;?G*%iuvPNZ-L;X@0Bylj$_Zb3T#PD=8o{Dq9Q;|(Pp}$p2Ra~NU za$T6DZ0s)rL-bnOQ+@nS7%`LdHZ{4R{B}H*iCs|kDTeMyO)_B%L*iNOXTd$Ox`T9R5_RKl%;TpODp7gMU zh#X&@0>j{ceq}+ivd*w~74Hnsuh7VQ+97PvvUWiGL5tiZB*%1y6mddE*xvpE_L(jX zT&L3&12@p4vsV>Rbdw_5X+%`z$S){r5Vm)|qVb6?b@FmaUabl|nM$#Y6{6j8G)4iU oeNw#b6?X}pVt0Gz2bvdXT~@8P)b*-!t;jWSr)*;tYbD_Xql}nLQxOnBjXDs*CXnm7UD zoHX$RXDYn2SVfMfqPf(G)XpH$el$K-eU1wf!tM)tDs2evXun9`w`mE@a;GMT8+JE27=nIB)o8swAT_}PuySNT54 z#@aBkWa6%kd$@1nfsI`}w6TXrgy;V$1fhA!_-HtlUP9PadhCdq@FtQ~3_}&gxj0Wt zbutB+wCTsMS+g_3&Z2?`6QKw4Qz|1*_PQVb+E8dhSe^+T%imFJ5nf!r*X{Fyxd>8u zbV_J-`v3SMtV50eu}&g9L0|H+#kQU&*RafIyJ%p)!cha)u*yR+ z@JIFr`;Gkz7@tw2b3RlqP<0=lbGm|T)H-fMfphR0~|Dq7(-%WGJYhB+%E#=9? z=@fcmlCrhG7!1){X^-^52Vulm((Bable+Z#;YcR-g0xRDbO$QUg`F4@*R{8OL99*6 zixX$&(5ZjY=9p|6S$VCHJpVDdUDKHkqF>8Yu6D>*I4FI+R&MNz{~Fqc^W4KVbOSu@ zVFnR-zB~tp7ytEVE=W$@Gi+VOKEt!Cbn=ll3Cpyy9ng}{IyVW)Go2wtoRAT=*S>(A z)1`sybh={T26}Y%rUew;q=+^f5mh-?e(u{oYAFDo-N4>(*jSXQp{qGXtx}V rQGnh0WBBkvDv6;Bj#HsBGV>|!C zUz8OU3qF94LR>qR8i}m1qma_j!^1!&k5xtbs-6>t{=&dX*iVnR15>Ith>q+!MV_WmKVixGWKJ_8`o2z6RXR_ z37F@ki61x<;a$Zlay%8yq)w!E28s5g(W&Z3i5y9N#;6{_EC7Ud$DN3oZ~_sH3UIHx zP%3!Lsm3bRUOv@73Y-R5LCkzPV*DLrz;RCr^_Qih?5;#{DY zg+iH%Jhth_?^(Ai!uFzyM`NJ}@@pz1PxiW>32V1E6mk-3Q=wzYDPd!gJYT-o?Q{E? z2vT`+N!aZ4mwgk~p~8Pz_84G1YHaJAIqZpj(oY+~L@s1K6){R>xhe za+8ewg-;Cj&BGfQ-%z1z4oWvDyU(w=Tte1r9c8wAd}oVE2UtTpZ@W3CqQMpLYcR6O V4e#Yls$+wL3X9H;_hM_{{$KXU#{U2S diff --git a/target/classes/com/soft/line/util/pagehelper/PageBeans.class b/target/classes/com/soft/line/util/pagehelper/PageBeans.class deleted file mode 100644 index ebb44c81b4ffe8ac7ce922b1f02696e369115145..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2572 zcma)+>uy^`5Xb-P+i`qpLfX0^NgKCZYCCCM0&O8qU6PcP1Sc`r4XEEv+=Fw9V@LKe z5`7ci0VI$xNJt>~+6UkZPryq6|Jmb9dTLv?Mg3Hy&kU3dlnp#qm}yx}+pHZ~&6eG$Ki++) zp!O8v+l_k5G3(BeS!-LtCx0b>`)4g(Q3yH>$E+y?YIe)v^1?IoYctz+>{_-!OHN^` zWLN8^({5S{mp#)P<#H}hALGodS_kb@Znmos7OiAI=YpV!ErxGtHMC*ZZ6~jAG3AMr zOCQl|yYZBZrVDmmq8(e!vUyyiWwy|$Fe#I%QSTZ95?f)hP-&cItG08}KF*5i#HyWH z&1{h((E`qiO@OraYBj!evNc9`GxT_GS!TV(C5e}J`{t~-bXvNVEXB;e<(xF07R{!4YB}tt!ko8eZUiY@xN13Nw~_u-n*9#9`i4MiPh1ST zNJm-BRN7m7g)6TZdwd2%xeFr3{6=}*#jKh2YWDE>nN@Le`BzP@#cpIv`sCZs<%qD0ky4}GtXMm?9H0xb zlkV@T9Pk*D_*`Lr^vQ|g1FXlefW;W@i*!|_cd!;i0<$qZ5Zg7eUBO%oOQJ4eQQ@Y< zoZy_X#rmq9%TD2vHhFR({mYk9fyF<|Exd)dNlp&jq@VoqQg*VYDG$6deXr%d*F3#esIgN2F|g0TEd#4GWcd&B;B#=R zbDN%QFu#)fCSxga$^3-y_Z0j(g^)Jh(0DP|p$jD_1B(DCyvxVkr^6Myr3_`3SSKlo z8&4i_Fufq7NXiMVhx&*Zf1e|7}_pizU|-1dZ6d}+_nPVoA1%I(A;qri8bjMgT~NFj%f zZh?yZOcr>8y_wu)Cig~UB3EZjCl+)k_*e|#4tcrPC*;l#=MH(f^W=Uof?KZo81Ac@ zn-AI$?ueIrYeMc1hjT}~+&kocG=f{6rZL>tH23CE?zoqGZ$j>^;oSNWJAY#j$bC41 VTb|M}+)L#4b>EzAJk;7p{{uyAg#G{k diff --git a/target/classes/com/soft/line/util/pagehelper/PageUtil.class b/target/classes/com/soft/line/util/pagehelper/PageUtil.class deleted file mode 100644 index 9642b07775a2d5933cdae026595bf771436a2313..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1748 zcmbVM>rNX-6#mAnSzi`noB(k`)6fQD(~|9l^nxAImW0H`0VJo9ntzL#td|Dm5fO`T%{Xw%^Pys&OiWDqFMX%$)CBznMS(di@80HM9zFa4Ux^MY#AN zhXt*FSind4SnsSAa2uc4__Tn}@Od72tlOvyOtf|%2$Wl4=*ykq(Y}lxd;2}^5Zv*4PrNA5db(+;ZV(GpTb=O8jl*Zk z?Gfh=RnT(>o-ezyH;|FLNAVl(F`N@irPVzz@{R;ntF1%tdoMve@&@&qapec9JKP_4 zL3nPUaWvE^o<<7TIwX@85KUw1%XaVsb0^9i?CLTMs^|56cX$6#b`-tl^|>~sfu&`E zg|qXRJKc@vgOiTjKAlx#BwSlXLEo>B?4${7FopIR@lq$It1SJTKDF1Ww(>gP5o6|M zqhZ)kdL&ghJTN1WN=BSuz8&~|PYolM{^Qt8&Kd8l$^HKda*YltWe8emhr_5Nw*pPa zsXdNKbLy6!r-KV9u{;NNu;Jh?zOeD7gRijZ;2!SV*mCdy4+WObM^qb42VY~`!4#$i zO5>bi{8QxP?eV3e`?PhV^s2o%a57Sb2^|D3RYxsSk_gQF8?)J0l9x4Me=MmA%#KD% zK{c|z*a`c}3;OZ4d_HECvaR-1;JR+Ze_yhP=E{;0vGO8wRcT&rHqRO_nKnQEv}}1D z6-LY<&(0*Tjlj}q)|)*qj(Oq7k##Kc;d1!i3H+=FKxu+9N6dAGn#-@?H@or@;#Ue8 zl(|lt%_1&Rb`k?z!Ys8s<}gnu1dBSYC%G3{jZ)#xN;&fi6B+ERlr1ByTVnMEimSgP zd(6jCRIC?pDpsN<=5_`@p?rc&4GsR}Byp8ut}YxSx1OzJe_>S1WV&vOnq?+)$TG8O zT;{KWw{QhZT;IbrKK6?w@;lh!&bL@b7gdC)nd&x@3JgY9KOpWZE6(Bw3zRbSctAhb zSo38(#oLrDq9<^jUbFNHM$YIi@cdnVld~Hu(BK8_Po2xXC{-U8yhyc3lut nVkSEB3UbW$WH5`S>+E+qe~iL!DC*(x(dC*9M~~%w16=(F8T+Wk diff --git a/target/classes/com/soft/line/util/poi/PoiUtils.class b/target/classes/com/soft/line/util/poi/PoiUtils.class deleted file mode 100644 index dbbd21b84232e54b5196cd1128e949232e1ad094..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 18374 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 Wm?)@lE%3{k!Q)U3^CX0dulsLa*KL>p diff --git a/target/classes/com/soft/line/util/redis/JedisProperties.class b/target/classes/com/soft/line/util/redis/JedisProperties.class deleted file mode 100644 index 2415ac3c2a29eac884f91863b04e34cb218eee45..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2023 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�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 Rc>bK%7cIR36k7Cye*qjA%~1dV diff --git a/target/classes/com/soft/line/xss/HTMLFilter.class b/target/classes/com/soft/line/xss/HTMLFilter.class deleted file mode 100644 index 0db08d40ab5fd9cf06ccbf059776b8e367f29160..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 14400 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 diff --git a/target/classes/com/soft/line/xss/XssFilter.class b/target/classes/com/soft/line/xss/XssFilter.class deleted file mode 100644 index 2de0a01e9e5782d28b712f2821b76d84abd40dde..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1998 zcmaJ?TUXpv7~N-XVJ@Xy3M~xKVyWd)NUQb6AhwRhQm266qH3SQ%wY(IWK1$hpZ!JZ zL#?jm^4TBda-Wkl9a2WtA}9IIciCru`#bZ`zkmD%;68RsDC6TIiuhyzt7X)%X5do; z>m?NMSs4%T(7@*<)bWLZM+PW(_x%>76j(E zL9k&vp{|irB?PX|H;%1S>&y(Kf9lB4j2!BoduX?7s(R&6heQ^EssHmAC_OrB%1&r| zZeZX`fuW}|Jn~vQmT#R%RwlB6mKPNfc%H7l7opgdKXzph)>5^S-Jrw#GQAx`KeB9B zBOi><6lW8d>6b66Mv9Y&r~>)v7ZO7dD98M$vI5nVe=jBh!;cOoa69F96owu1F(1hp zUt^kL=ic6U=3AYP^abu-+~>X#H3N?cq(ypt?*+TD)}%hP+Ddy~*KbNfrnUwXv8*V8 z2u$pD-OxUf`*vVcZ4X`73oYGffu%^r9p84_hpN**dHxS()AOZiC4T0%-_p{{pIS~= zW;r-QU@k>OkN-1y5YfkxC`Bx9F}FaGlteqEzw0|YR!C{N)K+ zvQ@!l3{`Lmg96u<)n9V78|viRWMH#`C-_R>*7Y_?pwBu$YeJw$1H>W7*`uUO5l%H4QW8&9RD-VH6nEscg^O-0rasrEedB zd`lj5c{7bgvl&(23sr0NR4t}wwhu$vdEz{*2yHzYl?UlWDe0$#k?h8kr|zb!Y4{sf zGxU7Qy4aRsbf2=Ly(g(VRuI${-oAD*%iFsQUU>YURC1v}^L(dz_#Eb!$yF%p;!B8M z_>#d0p9O6k#VFrZunN0^F|GpRxQeU}uG2e1TlrUHMzXJv%iv9llHM9e3D%0_7?`DW&uv-|n<;|YL8EX5JSq!v?gq>$F9j26>z zWHDo6)`VqZP9S>2DLZOKAd_0(vG?qK%a`7sE0tALs%ouK{eBdX~50(0y6O3CsoFO}so&)WBW>zVKW zS>mZ@SF6%n7BIbfQGuy{>`tJ4L#kqB`+@D*C8?yx%B=;d9_~u-Ag4U1ToC9=rE7SW zYnKaF-OF+b#+~H}Ox7v65Y#X)Qf4VVyk_u1IGyJ)H*J?3a+*fSFB+u_M?l==p7w&& z&W2%8SC$K^$PuKUx2y73p_ZJo^RG7SYHbxJh6Uoe%C47}cO1R1(Z4NVR*#cF9L))I zA!*`j0`urepj(T6447C*@U~qe>Az1dF#CVo7Rdh7{R=LKK)T`;EW2vwi_&7LQl;!$ zO75#*ovSq-o+!s9-_3Pa)>O$|6c}resV~BUb<6YYgCNIr{MAxb9SC%%&U1c$Ye(k! z89c`*n)pfSCj#<{W`vNSwL%@Dj%KEhAU^OELJMWQ=52?8OK7FtU5`Q=+G#PK{thB_ z@@xniph4m(HS9dKpl-?>A#{xJA)V;^Q@eEV~F=ZzV=1*4B;9%lQk-bi8Vrdl;y`r#yE>l(3->y^#cE8nz$844e-rn z43bRNK5KRiW2a~qRN@e*gdg diff --git a/target/classes/com/soft/line/xss/XssJacksonDeserializer.class b/target/classes/com/soft/line/xss/XssJacksonDeserializer.class deleted file mode 100644 index 73f542320ea7bdf564ea8a324a790ad6a9adf383..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1358 zcmcgsT~8B16g|_HZfUDP`S1fjKn2=@PBbJwKu8QiloT-miLcY`P^RwgkeR7z{8jpb z#s`0ZKgxJ_Y1*cg;FAwKckb*x=ia&ZWPbno`3t~0p5~Fo{X8DvVIB)u%wr6XJUsUB zgdw}BBIULi(&frALuOkyB*R2aMeH(dUYT6gUu`nw3yN4Nfsw_jb=IfAK zed2gPINq_Af3$W__@AtfUP~(p6{s)LY%mlWeV@UU6YPnwPMS^_@YV&0``SppNAUN; z5Psu|u!eA=uA&C-XAw^6Xj?~4cHBm#))Jou4@A`Dht8;|NhRc4Jzj>DE0~81V3_My zKA3~yK&d01wc+?VcDH|W|Tl++aJ@BeJlLA@n?M@Uzi)go50R>VzA zFqHpQYz(BLkYCnTZ!W`SGfXFPQJTL!=#7Tq#b}kP}~%X1i!0*mw_ zWa+H{(x8Hnqjj7-PL`1!t9}RjMw=A!v}TjTDHLd5ya*tBgFF_Gh)81aE_rFPxz%%| zejxpo_JjD@1ix?*)5TLXCNY(8=1{^kA!Z1dB|D2b+@k$>ib6m?G5Lzp-R`D)PBu>G hRae)}kr~c5SgqI1Hj0_3OZ261hqzL>i}}Rf`wNH{b0`1+ diff --git a/target/classes/com/soft/line/xss/XssJacksonSerializer.class b/target/classes/com/soft/line/xss/XssJacksonSerializer.class deleted file mode 100644 index 1f0c043284eeca39d750b85c996b216c43d5c5eb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1560 zcmb_cTTc@~6#k|yYbI$jj>-_rt{Re;oo*U3{&%h+64BSUnL(V`y@*1WM%wSe0 zVNQd^5O@75L#F73Lt5qQv8TywT&r!>ylg({2Bv$;2V7Od#Jn?qFUKa8l zFS~R?#x{4ixpYFgb(m1QPQZ{Y+J4;%{2gVvWM?&kz)iej_+Cknjq7}l==9)N zVvyNljURB!2+Q`Ru+|CerSOF0%9rP9R=DD2$E#Q! z+D+*nI2ED~17zfHrkj^xpmq|TA%AgK2(cZOJZ58V;^vDBUV zW$HqsAIT(8MFmYbcmlz++0$*)}pUgkgrMi?yYOCnlca znF#|ahS|`ny9L`-I~@?iP{i)|*6WRS=@@e1tnoc=?+WVPdY#H?DbY}^MqdqVz9+Vn z<5E3SB9dOIx?3QxdyGY{J8d*}y&df?IWc^cjuOooV;JehK(jG+_I+66HjUaR2E8g& z^T}YCJZZh+@*r5ub-yf_pw~yIcZ%U^m{-~*XixQ{^%6-I{TcoH^54L|&?bhX7&($9S@ozq)&v9 wYO#0YQnl46wSJJJ8{AIF-OGynhq diff --git a/target/classes/log4j.properties b/target/classes/log4j.properties deleted file mode 100644 index 014f7e3..0000000 --- a/target/classes/log4j.properties +++ /dev/null @@ -1,10 +0,0 @@ -log4j.rootLogger=debug, stdout, R -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%5p - %m%n -log4j.appender.R=org.apache.log4j.RollingFileAppender -log4j.appender.R.File=firestorm.log -log4j.appender.R.MaxFileSize=100KB -log4j.appender.R.MaxBackupIndex=1 -log4j.appender.R.layout=org.apache.log4j.PatternLayout -log4j.appender.R.layout.ConversionPattern=%p %t %c - %m%n \ No newline at end of file diff --git a/target/test-classes/com/soft/line/SoftlineFilesManageApplicationTests.class b/target/test-classes/com/soft/line/SoftlineFilesManageApplicationTests.class deleted file mode 100644 index 1756dd3be42004b9d10c57de40395eb0b4ff32e6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 570 zcmb7B%Sr<=6g`PB$kvMLxvaia)Ta5XB}(tT!{j;YgRn8~QW zENpSc5X44X`C>yOCM2?bUuvu7a;yqP4g;-?b@Oz#6Pi5XvyyH~F;iCNTx5z@Ql!)x znlg`_9Yg;Q?uRq+Bp6PeY?0+kC(~Ta<+I5jd1Q>`mX!JOf_&&EE(v#r0qSTl9R2&z z4Bg6@r$Q(EE}F^MViz8LN3}fKBnVP(p hJx4yEt|I>;wto=Wk{HlnCA&u1!@7$d5?`QQ;2Wahi^Ko` -- Gitee From e1c7d992a99da6458dc2b9d19b3615ee479091dc Mon Sep 17 00:00:00 2001 From: ljc Date: Fri, 13 Nov 2020 14:39:57 +0800 Subject: [PATCH 157/211] ignore --- .gitignore | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 62e7820..4c611f2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,5 @@ # Created by .ignore support plugin (hsz.mobi) -.idea \ No newline at end of file +.idea +target + +*.iml \ No newline at end of file -- Gitee From 64ffcef998e52b3a0e1cf69f8b5e56f628346ff1 Mon Sep 17 00:00:00 2001 From: ljc Date: Fri, 13 Nov 2020 14:50:06 +0800 Subject: [PATCH 158/211] =?UTF-8?q?=E3=80=82=E3=80=82=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 - softline-files-manage.iml | 157 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 157 insertions(+), 2 deletions(-) create mode 100644 softline-files-manage.iml diff --git a/.gitignore b/.gitignore index 4c611f2..3b78212 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,3 @@ # Created by .ignore support plugin (hsz.mobi) .idea target - -*.iml \ No newline at end of file diff --git a/softline-files-manage.iml b/softline-files-manage.iml new file mode 100644 index 0000000..3dc8c5c --- /dev/null +++ b/softline-files-manage.iml @@ -0,0 +1,157 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file -- Gitee From d762dbafd78828011c4850b002784096c5dd52bd Mon Sep 17 00:00:00 2001 From: ljc Date: Mon, 16 Nov 2020 19:43:50 +0800 Subject: [PATCH 159/211] =?UTF-8?q?=E9=85=8D=E7=BD=AEredis=E5=AF=86?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- softline-files-manage.iml | 157 ------------------ .../com/soft/line/util/redis/RedisConfig.java | 4 +- src/main/resources/application.properties | 14 +- 3 files changed, 11 insertions(+), 164 deletions(-) delete mode 100644 softline-files-manage.iml diff --git a/softline-files-manage.iml b/softline-files-manage.iml deleted file mode 100644 index 3dc8c5c..0000000 --- a/softline-files-manage.iml +++ /dev/null @@ -1,157 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/java/com/soft/line/util/redis/RedisConfig.java b/src/main/java/com/soft/line/util/redis/RedisConfig.java index 9b62f82..fbaf21e 100644 --- a/src/main/java/com/soft/line/util/redis/RedisConfig.java +++ b/src/main/java/com/soft/line/util/redis/RedisConfig.java @@ -33,7 +33,9 @@ public class RedisConfig { config.setMaxIdle(prop.getMaxIdle()); config.setMaxWaitMillis(prop.getMaxWaitMillis()); List jedisShardInfoList = new ArrayList<>(); - jedisShardInfoList.add(new JedisShardInfo(prop.getUri())); + JedisShardInfo jsi =new JedisShardInfo(prop.getUri()); + jsi.setPassword(prop.getPassword()); + jedisShardInfoList.add(jsi); ShardedJedisPool shardedJedisPool = new ShardedJedisPool(config, jedisShardInfoList); return shardedJedisPool; } diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index fc06422..b7114ac 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,9 +1,10 @@ -server.port=9100 +server.port=9101 server.servlet.context-path=/softline #spring.datasource.url= jdbc:mysql://175.24.112.245:3306/rz_archives?characterEncoding=utf-8&useSSL=false -spring.datasource.url= jdbc:mysql://127.0.0.1:3306/rz_archives?characterEncoding=utf-8&useSSL=false +#spring.datasource.url= jdbc:mysql://127.0.0.1:3306/rz_archives?characterEncoding=utf-8&useSSL=false +spring.datasource.url= jdbc:mysql://192.168.1.178:3306/las?characterEncoding=utf-8&useSSL=false spring.datasource.username=root -spring.datasource.password=root +spring.datasource.password=root123 spring.datasource.driver-class-name=com.mysql.jdbc.Driver #ݿӳ spring.datasource.type=com.alibaba.druid.pool.DruidDataSource @@ -24,10 +25,11 @@ spring.datasource.druid.useGlobalDataSourceStat=true spring.datasource.druid.connectionProperties=druid.stat.mergeSql=true;druid.stat.slowSqlMillis=500 #redisӵַ -spring.jedis.host = 127.0.0.1 -spring.jedis.password= 123456 +spring.jedis.host = 192.168.1.178 +#spring.jedis.password= 123456 +spring.jedis.password= las@123 spring.jedis.port = 6379 -spring.jedis.uri=redis://127.0.0.1:6379/11 +spring.jedis.uri=redis://192.168.1.178:6379/0 spring.jedis.maxTotal=100 spring.jedis.maxIdle= 10 -- Gitee From 92f018abea7ee47b2e02b74e216df62264ef969d Mon Sep 17 00:00:00 2001 From: ljc Date: Wed, 18 Nov 2020 17:29:17 +0800 Subject: [PATCH 160/211] =?UTF-8?q?=E7=99=BB=E9=99=86=E5=8F=96las=5Fuser?= =?UTF-8?q?=5Finfo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../line/controller/CommonController.java | 5 +++ .../com/soft/line/entity/LasUserInfo.java | 42 +++++++++++++++++++ .../soft/line/mapper/CodeDetailMapper.java | 2 + .../com/soft/line/mapper/CodeDetailMapper.xml | 11 +++++ .../soft/line/mapper/LasUserInfoMapper.java | 15 +++++++ .../soft/line/mapper/LasUserInfoMapper.xml | 35 ++++++++++++++++ .../soft/line/service/CodeDetailService.java | 2 + .../service/impl/CodeDetailServiceImpl.java | 22 ++++++++++ .../line/service/impl/LoginServiceImpl.java | 20 ++++++--- 9 files changed, 148 insertions(+), 6 deletions(-) create mode 100644 src/main/java/com/soft/line/entity/LasUserInfo.java create mode 100644 src/main/java/com/soft/line/mapper/LasUserInfoMapper.java create mode 100644 src/main/java/com/soft/line/mapper/LasUserInfoMapper.xml diff --git a/src/main/java/com/soft/line/controller/CommonController.java b/src/main/java/com/soft/line/controller/CommonController.java index e7c4437..b85ef66 100644 --- a/src/main/java/com/soft/line/controller/CommonController.java +++ b/src/main/java/com/soft/line/controller/CommonController.java @@ -70,5 +70,10 @@ public class CommonController { return CommonResult.success(roleInfoService.selectAll()); } + @GetMapping("getDepByRole") + @ApiOperation(value = "根据角色获取部门") + public CommonResult> getDepByRole() { + return CommonResult.success(codeDetailService.getDepByRole()); + } } diff --git a/src/main/java/com/soft/line/entity/LasUserInfo.java b/src/main/java/com/soft/line/entity/LasUserInfo.java new file mode 100644 index 0000000..92b1ff7 --- /dev/null +++ b/src/main/java/com/soft/line/entity/LasUserInfo.java @@ -0,0 +1,42 @@ +package com.soft.line.entity; + +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.hibernate.validator.constraints.Length; + +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Pattern; +import java.util.Date; + +@Data +@NoArgsConstructor +@AllArgsConstructor +public class LasUserInfo { + + private Integer id; + + @ApiModelProperty(value = "用户名") + private String userName; + + @ApiModelProperty(value = "密码") + private String password; + + @ApiModelProperty(value = "电话") + private String telephone; + + private String lastUpdateUser; + + private Date lastUpdateTime; + + @ApiModelProperty(value = "状态") + private String userStatus; + + @ApiModelProperty(value = "角色") + private Integer roleId; + + @ApiModelProperty(value = "部门ID") + private String depId; + +} \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/CodeDetailMapper.java b/src/main/java/com/soft/line/mapper/CodeDetailMapper.java index 5660ee6..b34984b 100644 --- a/src/main/java/com/soft/line/mapper/CodeDetailMapper.java +++ b/src/main/java/com/soft/line/mapper/CodeDetailMapper.java @@ -35,4 +35,6 @@ public interface CodeDetailMapper { List selectByCodeType(@Param("codeType") String codeType); CodeDetail selectByCodeContent1(@Param("codeType") String codeType,@Param("codeContent1") String codeContent1); + + List getDepByRole(@Param("userId") int userId); } \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/CodeDetailMapper.xml b/src/main/java/com/soft/line/mapper/CodeDetailMapper.xml index 09bdbc0..8da2022 100644 --- a/src/main/java/com/soft/line/mapper/CodeDetailMapper.xml +++ b/src/main/java/com/soft/line/mapper/CodeDetailMapper.xml @@ -56,4 +56,15 @@ and `code_content1` = #{codeContent1} + + + \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/LasUserInfoMapper.java b/src/main/java/com/soft/line/mapper/LasUserInfoMapper.java new file mode 100644 index 0000000..27b57c1 --- /dev/null +++ b/src/main/java/com/soft/line/mapper/LasUserInfoMapper.java @@ -0,0 +1,15 @@ +package com.soft.line.mapper; + +import com.soft.line.entity.LasUserInfo; + +public interface LasUserInfoMapper { + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table user_info + * + * @mbggenerated + */ + LasUserInfo selectByPrimaryKey(Integer id); + +} \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/LasUserInfoMapper.xml b/src/main/java/com/soft/line/mapper/LasUserInfoMapper.xml new file mode 100644 index 0000000..ccb25ad --- /dev/null +++ b/src/main/java/com/soft/line/mapper/LasUserInfoMapper.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/soft/line/service/CodeDetailService.java b/src/main/java/com/soft/line/service/CodeDetailService.java index 838a73d..9c2f29e 100644 --- a/src/main/java/com/soft/line/service/CodeDetailService.java +++ b/src/main/java/com/soft/line/service/CodeDetailService.java @@ -13,4 +13,6 @@ public interface CodeDetailService { public CodeDetail selectByCodeContent1(String codeType, String codeContent1); public List selectByCodeType(String codeType); + + public List getDepByRole(); } diff --git a/src/main/java/com/soft/line/service/impl/CodeDetailServiceImpl.java b/src/main/java/com/soft/line/service/impl/CodeDetailServiceImpl.java index fe6b21a..a36a19d 100644 --- a/src/main/java/com/soft/line/service/impl/CodeDetailServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/CodeDetailServiceImpl.java @@ -1,12 +1,16 @@ package com.soft.line.service.impl; import com.soft.line.entity.CodeDetail; +import com.soft.line.filter.HttpRequestUtil; +import com.soft.line.filter.UserTokenDto; import com.soft.line.mapper.CodeDetailMapper; +import com.soft.line.mapper.RoleInfoMapper; import com.soft.line.service.CodeDetailService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; @Service @@ -14,6 +18,8 @@ import java.util.List; public class CodeDetailServiceImpl implements CodeDetailService { @Autowired private CodeDetailMapper codeDetailMapper; + @Autowired + private RoleInfoMapper roleInfoMapper; @Override public CodeDetail selectByPrimaryKey(String codeType, String codeDetail) { @@ -34,4 +40,20 @@ public class CodeDetailServiceImpl implements CodeDetailService { public List selectByCodeType(String codeType) { return codeDetailMapper.selectByCodeType(codeType); } + + @Override + public List getDepByRole() { + List depList = new ArrayList(); + UserTokenDto userToken= HttpRequestUtil.getUserToken(); + if(userToken!=null){ + String roleName = roleInfoMapper.selectByPrimaryKey(userToken.getUserInfo().getRoleId()).getName(); + if (roleName.contains("管理员")){ + depList = codeDetailMapper.selectByCodeType("1"); + }else { + depList = codeDetailMapper.getDepByRole(userToken.getUserInfo().getId()); + } + } + return depList; + } + } diff --git a/src/main/java/com/soft/line/service/impl/LoginServiceImpl.java b/src/main/java/com/soft/line/service/impl/LoginServiceImpl.java index 538ba7d..5fbfff3 100644 --- a/src/main/java/com/soft/line/service/impl/LoginServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/LoginServiceImpl.java @@ -7,10 +7,7 @@ import com.soft.line.entity.*; import com.soft.line.filter.GsonUtil; import com.soft.line.filter.HttpRequestUtil; import com.soft.line.filter.UserTokenDto; -import com.soft.line.mapper.ButtonInfoMapper; -import com.soft.line.mapper.MenuInfoMapper; -import com.soft.line.mapper.RoleInfoMapper; -import com.soft.line.mapper.UserInfoMapper; +import com.soft.line.mapper.*; import com.soft.line.service.LoginService; import com.soft.line.util.MP.AjaxResult; import com.soft.line.util.MP.OpenIdUtil; @@ -44,6 +41,8 @@ public class LoginServiceImpl implements LoginService { @Autowired private UserInfoMapper userInfoMapper; + @Autowired + private LasUserInfoMapper lasUserInfoMapper; @Resource private RedisClient redisClient; @Autowired @@ -260,14 +259,23 @@ public class LoginServiceImpl implements LoginService { public UserPermission getUserPermission() { UserTokenDto userTokenDto=HttpRequestUtil.getUserToken(); Integer userId = userTokenDto.getUserInfo().getId(); - UserInfo userInfo=userInfoMapper.selectByPrimaryKey(userId); + /*UserInfo userInfo=userInfoMapper.selectByPrimaryKey(userId); UserPermission userPermission=new UserPermission(); userPermission.setId(userId); userPermission.setPhone(userInfo.getPhone()); - userPermission.setAvatar(userInfo.getHeadImgUrl()); + //userPermission.setAvatar(userInfo.getHeadImgUrl()); userPermission.setModifyTime(userInfo.getModifyTime()); userPermission.setRoleId(userInfo.getRoleId()); userPermission.setUserName(userInfo.getUserName()); + userPermission.setStatus(Integer.parseInt(userInfo.getUserStatus()));*/ + LasUserInfo userInfo=lasUserInfoMapper.selectByPrimaryKey(userId); + UserPermission userPermission=new UserPermission(); + userPermission.setId(userId); + userPermission.setPhone(userInfo.getTelephone()); + //userPermission.setAvatar(userInfo.getHeadImgUrl()); + userPermission.setModifyTime(userInfo.getLastUpdateTime()); + userPermission.setRoleId(userInfo.getRoleId()); + userPermission.setUserName(userInfo.getUserName()); userPermission.setStatus(Integer.parseInt(userInfo.getUserStatus())); //获取对应角色 RoleInfo role = roleInfoMapper.selectByPrimaryKey(userInfo.getRoleId()); -- Gitee From 0e91384b15783d06a240e21e6766d9d8d5ebfb09 Mon Sep 17 00:00:00 2001 From: ljc <1119265069@qq.com> Date: Thu, 19 Nov 2020 00:19:44 +0800 Subject: [PATCH 161/211] =?UTF-8?q?=E7=99=BB=E5=BD=95=E5=AF=86=E7=A0=81?= =?UTF-8?q?=E5=8A=A0=E5=AF=86=EF=BC=9B=E9=83=A8=E9=97=A8=E5=8E=BBlas=5Fdep?= =?UTF-8?q?artmentinfo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 6 ++ .../line/controller/CommonController.java | 19 +++-- .../soft/line/entity/LasDepartmentInfo.java | 34 +++++++++ .../soft/line/mapper/ContractInfoMapper.xml | 9 ++- .../line/mapper/LasDepartmentInfoMapper.java | 13 ++++ .../line/mapper/LasDepartmentInfoMapper.xml | 27 +++++++ .../soft/line/mapper/LasUserInfoMapper.java | 9 +++ .../soft/line/mapper/LasUserInfoMapper.xml | 19 ++++- .../soft/line/service/CodeDetailService.java | 7 +- .../service/impl/CodeDetailServiceImpl.java | 26 ++++++- .../line/service/impl/LoginServiceImpl.java | 11 ++- .../line/util/encrypt/AesEncryptUtil.java | 34 +++++++++ .../soft/line/util/encrypt/BaseEncrypt.java | 73 +++++++++++++++++++ .../com/soft/line/util/encrypt/Md5Util.java | 18 +++++ 14 files changed, 291 insertions(+), 14 deletions(-) create mode 100644 src/main/java/com/soft/line/entity/LasDepartmentInfo.java create mode 100644 src/main/java/com/soft/line/mapper/LasDepartmentInfoMapper.java create mode 100644 src/main/java/com/soft/line/mapper/LasDepartmentInfoMapper.xml create mode 100644 src/main/java/com/soft/line/util/encrypt/AesEncryptUtil.java create mode 100644 src/main/java/com/soft/line/util/encrypt/BaseEncrypt.java create mode 100644 src/main/java/com/soft/line/util/encrypt/Md5Util.java diff --git a/pom.xml b/pom.xml index 267aea6..b93ca90 100644 --- a/pom.xml +++ b/pom.xml @@ -201,6 +201,12 @@ + + cn.hutool + hutool-all + 5.5.1 + + diff --git a/src/main/java/com/soft/line/controller/CommonController.java b/src/main/java/com/soft/line/controller/CommonController.java index b85ef66..e6c581d 100644 --- a/src/main/java/com/soft/line/controller/CommonController.java +++ b/src/main/java/com/soft/line/controller/CommonController.java @@ -1,9 +1,6 @@ package com.soft.line.controller; -import com.soft.line.entity.ButtonInfo; -import com.soft.line.entity.CodeDetail; -import com.soft.line.entity.MenuInfo; -import com.soft.line.entity.RoleInfo; +import com.soft.line.entity.*; import com.soft.line.service.ButtonInfoService; import com.soft.line.service.CodeDetailService; import com.soft.line.service.MenuInfoService; @@ -70,10 +67,22 @@ public class CommonController { return CommonResult.success(roleInfoService.selectAll()); } - @GetMapping("getDepByRole") + /*@GetMapping("getDepByRole") @ApiOperation(value = "根据角色获取部门") public CommonResult> getDepByRole() { return CommonResult.success(codeDetailService.getDepByRole()); + }*/ + + @GetMapping("getDepByRole") + @ApiOperation(value = "根据角色获取部门") + public CommonResult> getDepByRole() { + return CommonResult.success(codeDetailService.getDepByRole()); + } + + @GetMapping("/deparments") + @ApiOperation(value = "获取所有按钮列表") + public CommonResult> getAllDep() { + return CommonResult.success(codeDetailService.selectAllDep()); } } diff --git a/src/main/java/com/soft/line/entity/LasDepartmentInfo.java b/src/main/java/com/soft/line/entity/LasDepartmentInfo.java new file mode 100644 index 0000000..f095b8d --- /dev/null +++ b/src/main/java/com/soft/line/entity/LasDepartmentInfo.java @@ -0,0 +1,34 @@ +package com.soft.line.entity; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.hibernate.validator.constraints.Length; + +import javax.validation.constraints.NotNull; +import java.util.Date; + +@Data +@NoArgsConstructor +@AllArgsConstructor +public class LasDepartmentInfo { + + private Integer id; + + // 部门名词 + private String depName; + + // 上级部门ID + private String superiorDepId; + + //公司ID + private String companyId; + + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "Asia/Shanghai") + private Date createTime; + + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "Asia/Shanghai") + private Date updateTime; + +} \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml b/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml index a0baafc..555bc49 100644 --- a/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml +++ b/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml @@ -157,7 +157,8 @@ + SELECT dep.* FROM las_departmentinfo dep + WHERE where dep.id in (SELECT emp.dep_id from las_employee emp,las_user_info u_info + where u_info.employee_id = emp.id and u_info.id = '4') + + + + + \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/LasUserInfoMapper.java b/src/main/java/com/soft/line/mapper/LasUserInfoMapper.java index 27b57c1..c4b9990 100644 --- a/src/main/java/com/soft/line/mapper/LasUserInfoMapper.java +++ b/src/main/java/com/soft/line/mapper/LasUserInfoMapper.java @@ -2,6 +2,8 @@ package com.soft.line.mapper; import com.soft.line.entity.LasUserInfo; +import java.util.Map; + public interface LasUserInfoMapper { /** @@ -12,4 +14,11 @@ public interface LasUserInfoMapper { */ LasUserInfo selectByPrimaryKey(Integer id); + /** + * 根据登录信息，获取用户 + * @param map + * @return + */ + LasUserInfo userLogin(Map map); + } \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/LasUserInfoMapper.xml b/src/main/java/com/soft/line/mapper/LasUserInfoMapper.xml index ccb25ad..139d827 100644 --- a/src/main/java/com/soft/line/mapper/LasUserInfoMapper.xml +++ b/src/main/java/com/soft/line/mapper/LasUserInfoMapper.xml @@ -7,7 +7,7 @@ This element is automatically generated by MyBatis Generator, do not modify. --> - + @@ -32,4 +32,21 @@ where u_info.id = #{id,jdbcType=INTEGER} + + \ No newline at end of file diff --git a/src/main/java/com/soft/line/service/CodeDetailService.java b/src/main/java/com/soft/line/service/CodeDetailService.java index 9c2f29e..4d08c41 100644 --- a/src/main/java/com/soft/line/service/CodeDetailService.java +++ b/src/main/java/com/soft/line/service/CodeDetailService.java @@ -1,6 +1,7 @@ package com.soft.line.service; import com.soft.line.entity.CodeDetail; +import com.soft.line.entity.LasDepartmentInfo; import java.util.List; @@ -14,5 +15,9 @@ public interface CodeDetailService { public List selectByCodeType(String codeType); - public List getDepByRole(); + // public List getDepByRole(); + + public List getDepByRole(); + + public List selectAllDep(); } diff --git a/src/main/java/com/soft/line/service/impl/CodeDetailServiceImpl.java b/src/main/java/com/soft/line/service/impl/CodeDetailServiceImpl.java index a36a19d..216c392 100644 --- a/src/main/java/com/soft/line/service/impl/CodeDetailServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/CodeDetailServiceImpl.java @@ -1,9 +1,11 @@ package com.soft.line.service.impl; import com.soft.line.entity.CodeDetail; +import com.soft.line.entity.LasDepartmentInfo; import com.soft.line.filter.HttpRequestUtil; import com.soft.line.filter.UserTokenDto; import com.soft.line.mapper.CodeDetailMapper; +import com.soft.line.mapper.LasDepartmentInfoMapper; import com.soft.line.mapper.RoleInfoMapper; import com.soft.line.service.CodeDetailService; import lombok.extern.slf4j.Slf4j; @@ -20,6 +22,8 @@ public class CodeDetailServiceImpl implements CodeDetailService { private CodeDetailMapper codeDetailMapper; @Autowired private RoleInfoMapper roleInfoMapper; + @Autowired + private LasDepartmentInfoMapper lasDepartmentInfoMapper; @Override public CodeDetail selectByPrimaryKey(String codeType, String codeDetail) { @@ -41,7 +45,7 @@ public class CodeDetailServiceImpl implements CodeDetailService { return codeDetailMapper.selectByCodeType(codeType); } - @Override + /*@Override public List getDepByRole() { List depList = new ArrayList(); UserTokenDto userToken= HttpRequestUtil.getUserToken(); @@ -54,6 +58,26 @@ public class CodeDetailServiceImpl implements CodeDetailService { } } return depList; + }*/ + + @Override + public List getDepByRole() { + List depList = new ArrayList(); + UserTokenDto userToken= HttpRequestUtil.getUserToken(); + if(userToken!=null){ + String roleName = roleInfoMapper.selectByPrimaryKey(userToken.getUserInfo().getRoleId()).getName(); + if (roleName.contains("管理员")){ + depList = lasDepartmentInfoMapper.selectAll(); + }else { + depList = lasDepartmentInfoMapper.getDepByRole(userToken.getUserInfo().getId()); + } + } + return depList; + } + + @Override + public List selectAllDep() { + return lasDepartmentInfoMapper.selectAll(); } } diff --git a/src/main/java/com/soft/line/service/impl/LoginServiceImpl.java b/src/main/java/com/soft/line/service/impl/LoginServiceImpl.java index 5fbfff3..ba85055 100644 --- a/src/main/java/com/soft/line/service/impl/LoginServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/LoginServiceImpl.java @@ -12,6 +12,7 @@ import com.soft.line.service.LoginService; import com.soft.line.util.MP.AjaxResult; import com.soft.line.util.MP.OpenIdUtil; import com.soft.line.util.MP.SystemConstant; +import com.soft.line.util.encrypt.AesEncryptUtil; import com.soft.line.util.exception.CommonResult; import com.soft.line.util.exception.ResultData; import com.soft.line.util.redis.RedisClient; @@ -54,14 +55,20 @@ public class LoginServiceImpl implements LoginService { @Override public CommonResult userLogin(Map map) { - UserInfo userInfo= userInfoMapper.userLogin(map); + String password = (String)map.get("password"); + password= AesEncryptUtil.encrypt(password,AuthConstant.PASSWORD_ENCRYPT_KEY); + map.replace("password",password); + System.out.println("password:"+(String)map.get("password")); + // UserInfo userInfo= userInfoMapper.userLogin(map); + LasUserInfo userInfo = lasUserInfoMapper.userLogin(map); if(userInfo!=null){ UserInfoToken userInfoToken=new UserInfoToken(); userInfoToken.setUserName(userInfo.getUserName()); userInfoToken.setRoleId(userInfo.getRoleId()); String roleName=roleInfoMapper.selectRoleName(userInfo.getRoleId()); userInfoToken.setRoleName(roleName); - userInfoToken.setPhone(userInfo.getPhone()); + //userInfoToken.setPhone(userInfo.getPhone()); + userInfoToken.setPhone(userInfo.getTelephone()); userInfoToken.setId(userInfo.getId()); userInfoToken.setPassword(userInfo.getPassword()); UserTokenDto user=new UserTokenDto(); diff --git a/src/main/java/com/soft/line/util/encrypt/AesEncryptUtil.java b/src/main/java/com/soft/line/util/encrypt/AesEncryptUtil.java new file mode 100644 index 0000000..8823eb8 --- /dev/null +++ b/src/main/java/com/soft/line/util/encrypt/AesEncryptUtil.java @@ -0,0 +1,34 @@ +package com.soft.line.util.encrypt; + +import cn.hutool.crypto.SecureUtil; +import cn.hutool.crypto.symmetric.AES; + +/** + * AES方式加密解密数据工具类 + * + * @author 86185 + * @date 2020/5/9 16:55 + */ +public final class AesEncryptUtil extends BaseEncrypt { + + public static String encrypt(String content, String key) { + return encrypt(content, key.getBytes(DEFAULT_CHARSET)); + } + + public static String encrypt(String content, byte[] key) { + key = concat(key); + AES aes = SecureUtil.aes(key); + return encrypt(aes, content); + } + + public static String decrypt(String encrypt, String key) { + return decrypt(encrypt, key.getBytes(DEFAULT_CHARSET)); + } + + public static String decrypt(String encrypt, byte[] key) { + key = concat(key); + AES aes = SecureUtil.aes(key); + return decrypt(aes, encrypt); + } + +} diff --git a/src/main/java/com/soft/line/util/encrypt/BaseEncrypt.java b/src/main/java/com/soft/line/util/encrypt/BaseEncrypt.java new file mode 100644 index 0000000..a09058d --- /dev/null +++ b/src/main/java/com/soft/line/util/encrypt/BaseEncrypt.java @@ -0,0 +1,73 @@ +package com.soft.line.util.encrypt; + +import cn.hutool.crypto.symmetric.SymmetricCrypto; +import lombok.extern.slf4j.Slf4j; +import org.apache.tomcat.util.codec.binary.Base64; + +import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; + +/** + * @author 86185 + * @date 2020/5/9 16:49 + */ +@Slf4j +public class BaseEncrypt { + + private static final int DEFAULT_KEY_LENGTH = 16; + protected static final Charset DEFAULT_CHARSET = StandardCharsets.UTF_8; + + protected static String encrypt(SymmetricCrypto crypto, String content) { + try { + byte[] encrypt = crypto.encrypt(content); + return Base64.encodeBase64String(encrypt); + } catch (Exception e) { + log.warn("encrypt error", e); + throw new RuntimeException("encrypt content error."); + } + } + + protected static String decrypt(SymmetricCrypto crypto, String encrypt) { + try { + byte[] contentByte = Base64.decodeBase64(encrypt); + byte[] decrypt = crypto.decrypt(contentByte); + return new String(decrypt); + } catch (Exception e) { + log.warn("decrypt error", e); + throw new RuntimeException("decrypt error."); + } + } + + protected static byte[] concat(byte[] key) { + return concat(key, DEFAULT_KEY_LENGTH); + } + + protected static byte[] concat(byte[] key, int keyLength) { + if (key == null || key.length == keyLength) { + return key; + } + byte[] bytes = new byte[keyLength]; + if (key.length > keyLength) { + System.arraycopy(key, 0, bytes, 0, keyLength); + } else { + int len = keyLength - key.length; + for (int i = 0; i < len; i++) { + byte[] b = {(byte) len}; + key = concat(key, b); + } + bytes = key; + } + return bytes; + } + + private static byte[] concat(byte[] firstArray, byte[] secondArray) { + if (firstArray == null || secondArray == null) { + return null; + } + byte[] bytes = new byte[firstArray.length + secondArray.length]; + System.arraycopy(firstArray, 0, bytes, 0, firstArray.length); + System.arraycopy(secondArray, 0, bytes, firstArray.length, secondArray.length); + return bytes; + } + +} diff --git a/src/main/java/com/soft/line/util/encrypt/Md5Util.java b/src/main/java/com/soft/line/util/encrypt/Md5Util.java new file mode 100644 index 0000000..7787d87 --- /dev/null +++ b/src/main/java/com/soft/line/util/encrypt/Md5Util.java @@ -0,0 +1,18 @@ +package com.soft.line.util.encrypt; + +import org.apache.commons.codec.digest.DigestUtils; + +/** + * Md5加密工具 + * + * @author 86185 + * @date 2020/5/13 10:53 + */ +public class Md5Util { + + public static String encodeMd5(final String str) { + + return DigestUtils.md5Hex(str); + } + +} -- Gitee From 0174a389a4d1d9009155c772527c6b91b33b10d4 Mon Sep 17 00:00:00 2001 From: ljc <1119265069@qq.com> Date: Thu, 19 Nov 2020 00:45:34 +0800 Subject: [PATCH 162/211] =?UTF-8?q?=E9=83=A8=E9=97=A8=E5=8F=96las=5Fdepart?= =?UTF-8?q?mentinfo=E7=9A=84=E4=B8=80=E7=BA=A7=E9=83=A8=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/soft/line/mapper/ContractInfoMapper.xml | 2 +- .../soft/line/mapper/LasDepartmentInfoMapper.java | 6 ++++-- .../soft/line/mapper/LasDepartmentInfoMapper.xml | 13 +++++++++---- .../line/service/impl/CodeDetailServiceImpl.java | 7 ++++--- 4 files changed, 18 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml b/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml index 555bc49..43c3ab3 100644 --- a/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml +++ b/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml @@ -245,7 +245,7 @@ diff --git a/src/main/java/com/soft/line/mapper/LasDepartmentInfoMapper.java b/src/main/java/com/soft/line/mapper/LasDepartmentInfoMapper.java index 77fe5e2..7a758d2 100644 --- a/src/main/java/com/soft/line/mapper/LasDepartmentInfoMapper.java +++ b/src/main/java/com/soft/line/mapper/LasDepartmentInfoMapper.java @@ -7,7 +7,9 @@ import java.util.List; public interface LasDepartmentInfoMapper { - List getDepByRole(@Param("userId") int userId); + LasDepartmentInfo getDepByRole(@Param("userId") int userId); - List selectAll(); + List selectAllSuperior(); + + List selectSuperiorDepByDepId(@Param("depId") int depId); } \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/LasDepartmentInfoMapper.xml b/src/main/java/com/soft/line/mapper/LasDepartmentInfoMapper.xml index c6e4237..ed3ea3c 100644 --- a/src/main/java/com/soft/line/mapper/LasDepartmentInfoMapper.xml +++ b/src/main/java/com/soft/line/mapper/LasDepartmentInfoMapper.xml @@ -14,14 +14,19 @@ - SELECT dep.* FROM las_departmentinfo dep - WHERE where dep.id in (SELECT emp.dep_id from las_employee emp,las_user_info u_info - where u_info.employee_id = emp.id and u_info.id = '4') + WHERE dep.id in (SELECT emp.dep_id from las_employee emp,las_user_info u_info + where u_info.employee_id = emp.id and u_info.id = #{userId}) - + SELECT dep.* FROM las_departmentinfo dep where dep.superior_dep_id = 0 or dep.superior_dep_id = dep.id + + + \ No newline at end of file diff --git a/src/main/java/com/soft/line/service/impl/CodeDetailServiceImpl.java b/src/main/java/com/soft/line/service/impl/CodeDetailServiceImpl.java index 216c392..0709a16 100644 --- a/src/main/java/com/soft/line/service/impl/CodeDetailServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/CodeDetailServiceImpl.java @@ -67,9 +67,10 @@ public class CodeDetailServiceImpl implements CodeDetailService { if(userToken!=null){ String roleName = roleInfoMapper.selectByPrimaryKey(userToken.getUserInfo().getRoleId()).getName(); if (roleName.contains("管理员")){ - depList = lasDepartmentInfoMapper.selectAll(); + depList = lasDepartmentInfoMapper.selectAllSuperior(); }else { - depList = lasDepartmentInfoMapper.getDepByRole(userToken.getUserInfo().getId()); + LasDepartmentInfo departmentInfo = lasDepartmentInfoMapper.getDepByRole(userToken.getUserInfo().getId()); + depList = lasDepartmentInfoMapper.selectSuperiorDepByDepId(departmentInfo.getId()); } } return depList; @@ -77,7 +78,7 @@ public class CodeDetailServiceImpl implements CodeDetailService { @Override public List selectAllDep() { - return lasDepartmentInfoMapper.selectAll(); + return lasDepartmentInfoMapper.selectAllSuperior(); } } -- Gitee From b1c63dffb87faf869728b427503d4c369f6d6faa Mon Sep 17 00:00:00 2001 From: ljc Date: Thu, 19 Nov 2020 10:42:09 +0800 Subject: [PATCH 163/211] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E9=83=A8?= =?UTF-8?q?=E9=97=A8=E5=8F=96las=5Fuser=5Finfo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../line/controller/CommonController.java | 2 +- .../soft/line/entity/LasDepartmentInfo.java | 2 +- .../com/soft/line/entity/UserPermission.java | 2 +- .../soft/line/mapper/AppletCommonMapper.xml | 6 ++++- .../line/mapper/LasDepartmentInfoMapper.java | 2 +- .../line/mapper/LasDepartmentInfoMapper.xml | 8 +++---- .../soft/line/mapper/LasUserInfoMapper.xml | 23 ++++++++++--------- .../line/service/impl/LoginServiceImpl.java | 2 +- .../service/impl/StatisticsServiceImpl.java | 2 +- 9 files changed, 27 insertions(+), 22 deletions(-) diff --git a/src/main/java/com/soft/line/controller/CommonController.java b/src/main/java/com/soft/line/controller/CommonController.java index e6c581d..284b8ac 100644 --- a/src/main/java/com/soft/line/controller/CommonController.java +++ b/src/main/java/com/soft/line/controller/CommonController.java @@ -80,7 +80,7 @@ public class CommonController { } @GetMapping("/deparments") - @ApiOperation(value = "获取所有按钮列表") + @ApiOperation(value = "获取所有部门列表") public CommonResult> getAllDep() { return CommonResult.success(codeDetailService.selectAllDep()); } diff --git a/src/main/java/com/soft/line/entity/LasDepartmentInfo.java b/src/main/java/com/soft/line/entity/LasDepartmentInfo.java index f095b8d..30e5996 100644 --- a/src/main/java/com/soft/line/entity/LasDepartmentInfo.java +++ b/src/main/java/com/soft/line/entity/LasDepartmentInfo.java @@ -14,7 +14,7 @@ import java.util.Date; @AllArgsConstructor public class LasDepartmentInfo { - private Integer id; + private Long id; // 部门名词 private String depName; diff --git a/src/main/java/com/soft/line/entity/UserPermission.java b/src/main/java/com/soft/line/entity/UserPermission.java index 3eb0986..2f638fb 100644 --- a/src/main/java/com/soft/line/entity/UserPermission.java +++ b/src/main/java/com/soft/line/entity/UserPermission.java @@ -17,7 +17,7 @@ public class UserPermission { private String userName; - private int status; + private String status; private String phone; diff --git a/src/main/java/com/soft/line/mapper/AppletCommonMapper.xml b/src/main/java/com/soft/line/mapper/AppletCommonMapper.xml index 3dbf951..11e5bd7 100644 --- a/src/main/java/com/soft/line/mapper/AppletCommonMapper.xml +++ b/src/main/java/com/soft/line/mapper/AppletCommonMapper.xml @@ -5,7 +5,11 @@ - SELECT dep.* FROM las_departmentinfo dep - WHERE dep.id = #{depId} and (dep.superior_dep_id = 0 or dep.superior_dep_id = dep.id) + WHERE dep.id = #{depId} and dep.superior_dep_id = 0 \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/LasUserInfoMapper.xml b/src/main/java/com/soft/line/mapper/LasUserInfoMapper.xml index 139d827..98d76f1 100644 --- a/src/main/java/com/soft/line/mapper/LasUserInfoMapper.xml +++ b/src/main/java/com/soft/line/mapper/LasUserInfoMapper.xml @@ -9,7 +9,7 @@ - + @@ -22,14 +22,15 @@ u_info.id, u_info.username, u_info.passwords, - u_info.telephone, + emp.telephone telephone, u_info.last_update_user, u_info.last_update_time, u_info.user_status, - (select emp.dep_id from las_employee emp where emp.id = u_info.employee_id) dep_id, + emp.dep_id dep_id, (select u_role.role_id from las_user_role u_role where u_role.user_id = u_info.id ) role_id - FROM las_user_info u_info - where u_info.id = #{id,jdbcType=INTEGER} + FROM las_user_info u_info,las_employee emp + where emp.id = u_info.employee_id + and u_info.id = #{id,jdbcType=INTEGER} \ No newline at end of file diff --git a/src/main/java/com/soft/line/service/impl/LoginServiceImpl.java b/src/main/java/com/soft/line/service/impl/LoginServiceImpl.java index ba85055..6c1bb43 100644 --- a/src/main/java/com/soft/line/service/impl/LoginServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/LoginServiceImpl.java @@ -283,7 +283,7 @@ public class LoginServiceImpl implements LoginService { userPermission.setModifyTime(userInfo.getLastUpdateTime()); userPermission.setRoleId(userInfo.getRoleId()); userPermission.setUserName(userInfo.getUserName()); - userPermission.setStatus(Integer.parseInt(userInfo.getUserStatus())); + userPermission.setStatus(userInfo.getUserStatus()); //获取对应角色 RoleInfo role = roleInfoMapper.selectByPrimaryKey(userInfo.getRoleId()); userPermission.setRole(role); diff --git a/src/main/java/com/soft/line/service/impl/StatisticsServiceImpl.java b/src/main/java/com/soft/line/service/impl/StatisticsServiceImpl.java index ab0e9ce..c4584b2 100644 --- a/src/main/java/com/soft/line/service/impl/StatisticsServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/StatisticsServiceImpl.java @@ -63,7 +63,7 @@ public class StatisticsServiceImpl implements StatisticsService { @Override public List> countDepGroupByYear(Map map) { - String dep = (String)map.get("dep"); + String dep = map.get("dep").toString(); System.out.println("dep:"+dep); return contractInfoMapper.countDepGroupByYear(dep); } -- Gitee From 60cb67a7febacb410e9088b2859f89470fe02b31 Mon Sep 17 00:00:00 2001 From: ljc Date: Thu, 19 Nov 2020 15:26:30 +0800 Subject: [PATCH 164/211] =?UTF-8?q?las=5Fuser=5Finfo=E7=9A=84id=E5=8F=96va?= =?UTF-8?q?rchar=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/soft/line/entity/LasDepartmentInfo.java | 2 +- .../java/com/soft/line/mapper/LasDepartmentInfoMapper.java | 2 +- .../java/com/soft/line/mapper/LasDepartmentInfoMapper.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/soft/line/entity/LasDepartmentInfo.java b/src/main/java/com/soft/line/entity/LasDepartmentInfo.java index 30e5996..1de7d7a 100644 --- a/src/main/java/com/soft/line/entity/LasDepartmentInfo.java +++ b/src/main/java/com/soft/line/entity/LasDepartmentInfo.java @@ -14,7 +14,7 @@ import java.util.Date; @AllArgsConstructor public class LasDepartmentInfo { - private Long id; + private String id; // 部门名词 private String depName; diff --git a/src/main/java/com/soft/line/mapper/LasDepartmentInfoMapper.java b/src/main/java/com/soft/line/mapper/LasDepartmentInfoMapper.java index 8e94726..b228699 100644 --- a/src/main/java/com/soft/line/mapper/LasDepartmentInfoMapper.java +++ b/src/main/java/com/soft/line/mapper/LasDepartmentInfoMapper.java @@ -11,5 +11,5 @@ public interface LasDepartmentInfoMapper { List selectAllSuperior(); - List selectSuperiorDepByDepId(@Param("depId") Long depId); + List selectSuperiorDepByDepId(@Param("depId") String depId); } \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/LasDepartmentInfoMapper.xml b/src/main/java/com/soft/line/mapper/LasDepartmentInfoMapper.xml index 280ae24..889f50b 100644 --- a/src/main/java/com/soft/line/mapper/LasDepartmentInfoMapper.xml +++ b/src/main/java/com/soft/line/mapper/LasDepartmentInfoMapper.xml @@ -6,7 +6,7 @@ WARNING - @mbggenerated This element is automatically generated by MyBatis Generator, do not modify. --> - + @@ -24,7 +24,7 @@ SELECT dep.* FROM las_departmentinfo dep where dep.superior_dep_id = 0 - SELECT dep.* FROM las_departmentinfo dep WHERE dep.id = #{depId} and dep.superior_dep_id = 0 -- Gitee From bbce0053ad22c0d7f05c719b646c4d017c953022 Mon Sep 17 00:00:00 2001 From: ljc Date: Fri, 20 Nov 2020 15:27:13 +0800 Subject: [PATCH 165/211] =?UTF-8?q?=E5=90=88=E5=90=8C=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=EF=BC=8C=E9=83=A8=E9=97=A8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/soft/line/mapper/ContractInfoMapper.xml | 2 +- .../com/soft/line/mapper/LasDepartmentInfoMapper.java | 2 ++ .../com/soft/line/mapper/LasDepartmentInfoMapper.xml | 5 +++++ .../java/com/soft/line/service/CodeDetailService.java | 2 ++ .../soft/line/service/impl/CodeDetailServiceImpl.java | 5 +++++ .../soft/line/service/impl/ContractInfoServiceImpl.java | 6 +++--- src/main/java/com/soft/line/util/poi/PoiUtils.java | 9 ++++++++- 7 files changed, 26 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml b/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml index 43c3ab3..98e5e17 100644 --- a/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml +++ b/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml @@ -10,7 +10,7 @@ - + diff --git a/src/main/java/com/soft/line/mapper/LasDepartmentInfoMapper.java b/src/main/java/com/soft/line/mapper/LasDepartmentInfoMapper.java index b228699..c49bf66 100644 --- a/src/main/java/com/soft/line/mapper/LasDepartmentInfoMapper.java +++ b/src/main/java/com/soft/line/mapper/LasDepartmentInfoMapper.java @@ -12,4 +12,6 @@ public interface LasDepartmentInfoMapper { List selectAllSuperior(); List selectSuperiorDepByDepId(@Param("depId") String depId); + + LasDepartmentInfo selectSuperiorDepByDepName(@Param("depName") String depName); } \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/LasDepartmentInfoMapper.xml b/src/main/java/com/soft/line/mapper/LasDepartmentInfoMapper.xml index 889f50b..adeb9f2 100644 --- a/src/main/java/com/soft/line/mapper/LasDepartmentInfoMapper.xml +++ b/src/main/java/com/soft/line/mapper/LasDepartmentInfoMapper.xml @@ -29,4 +29,9 @@ WHERE dep.id = #{depId} and dep.superior_dep_id = 0 + + \ No newline at end of file diff --git a/src/main/java/com/soft/line/service/CodeDetailService.java b/src/main/java/com/soft/line/service/CodeDetailService.java index 4d08c41..bb17507 100644 --- a/src/main/java/com/soft/line/service/CodeDetailService.java +++ b/src/main/java/com/soft/line/service/CodeDetailService.java @@ -20,4 +20,6 @@ public interface CodeDetailService { public List getDepByRole(); public List selectAllDep(); + + public LasDepartmentInfo selectSuperiorDepByDepName(String depName); } diff --git a/src/main/java/com/soft/line/service/impl/CodeDetailServiceImpl.java b/src/main/java/com/soft/line/service/impl/CodeDetailServiceImpl.java index 0709a16..51a86c5 100644 --- a/src/main/java/com/soft/line/service/impl/CodeDetailServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/CodeDetailServiceImpl.java @@ -81,4 +81,9 @@ public class CodeDetailServiceImpl implements CodeDetailService { return lasDepartmentInfoMapper.selectAllSuperior(); } + @Override + public LasDepartmentInfo selectSuperiorDepByDepName(String depName) { + return lasDepartmentInfoMapper.selectSuperiorDepByDepName(depName); + } + } diff --git a/src/main/java/com/soft/line/service/impl/ContractInfoServiceImpl.java b/src/main/java/com/soft/line/service/impl/ContractInfoServiceImpl.java index ec0d101..6003567 100644 --- a/src/main/java/com/soft/line/service/impl/ContractInfoServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/ContractInfoServiceImpl.java @@ -41,9 +41,9 @@ public class ContractInfoServiceImpl implements ContractInfoService{ @Override public PageInfo getAllContracts(Map map) { PageUtil.setPageParam(map); - List certificateInfos=contractInfoMapper.selectAll(map); - PageInfo beans = new PageInfo(certificateInfos); - beans.setList(certificateInfos); + List constracts=contractInfoMapper.selectAll(map); + PageInfo beans = new PageInfo(constracts); + beans.setList(constracts); return beans; } diff --git a/src/main/java/com/soft/line/util/poi/PoiUtils.java b/src/main/java/com/soft/line/util/poi/PoiUtils.java index 2b72b97..1cac22e 100644 --- a/src/main/java/com/soft/line/util/poi/PoiUtils.java +++ b/src/main/java/com/soft/line/util/poi/PoiUtils.java @@ -3,6 +3,7 @@ package com.soft.line.util.poi; import com.soft.line.entity.CertificateInfo; import com.soft.line.entity.CodeDetail; import com.soft.line.entity.ContractInfo; +import com.soft.line.entity.LasDepartmentInfo; import com.soft.line.service.CertificateInfoService; import com.soft.line.service.CodeDetailService; import com.soft.line.service.ContractInfoService; @@ -363,11 +364,17 @@ public class PoiUtils { switch (k) { case 0: //部门 - cd = codeDetailService.selectByCodeContent1("1",cellValue); + /*cd = codeDetailService.selectByCodeContent1("1",cellValue); if (cd==null){ warningMsg+="第"+j+"行部门不存在 "; }else{ cont.setDepId(cd.getCodeDetail()); + }*/ + LasDepartmentInfo dp = codeDetailService.selectSuperiorDepByDepName(cellValue); + if (dp==null){ + warningMsg+="第"+j+"行部门不存在 "; + }else{ + cont.setDepId(dp.getId()); } break; case 1: -- Gitee From 8eacb694c9d27d8bf2c780bd15f95b4fc0978ba8 Mon Sep 17 00:00:00 2001 From: ljc Date: Tue, 24 Nov 2020 17:02:21 +0800 Subject: [PATCH 166/211] =?UTF-8?q?=E5=90=88=E5=90=8C=E3=80=81=E8=AF=81?= =?UTF-8?q?=E4=B9=A6=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/soft/line/entity/CertificateInfo.java | 22 +- .../com/soft/line/entity/ContractInfo.java | 46 ++- .../line/mapper/CertificateInfoMapper.xml | 32 +- .../soft/line/mapper/ContractInfoMapper.xml | 337 +++++++++--------- 4 files changed, 228 insertions(+), 209 deletions(-) diff --git a/src/main/java/com/soft/line/entity/CertificateInfo.java b/src/main/java/com/soft/line/entity/CertificateInfo.java index e9c1b48..9453eb0 100644 --- a/src/main/java/com/soft/line/entity/CertificateInfo.java +++ b/src/main/java/com/soft/line/entity/CertificateInfo.java @@ -29,31 +29,23 @@ public class CertificateInfo { @ApiModelProperty(value = "证书名称") @NotNull(message = "证书名称不能为空") - @Length(max = 200,message="证书名称不能大于200位") - + @Length(max = 100,message="证书名称不能大于100字") private String certName; - @ApiModelProperty(value = "项目名称") - @NotNull(message = "项目名称不能为空") - @Length(max = 200,message="项目名称不能大于200位") - private String projectName; - - @ApiModelProperty(value = "颁奖单位") - @NotNull(message = "颁奖单位不能为空") - @Length(max = 200,message="颁奖单位不能大于200位") + @ApiModelProperty(value = "颁发单位") + @NotNull(message = "颁发单位不能为空") + @Length(max = 200,message="颁发单位不能大于200字") private String certUnit; @ApiModelProperty(value = "发证日期") - @NotNull(message = "发证日期不能为空") @JsonFormat(pattern = "yyyyMMdd",timezone = "Asia/Shanghai") private Date beginDate; @ApiModelProperty(value = "到期日期") - @NotNull(message = "到期日期不能为空") @JsonFormat(pattern = "yyyyMMdd",timezone = "Asia/Shanghai") private Date endDate; - @Length(max = 200,message="备注不能大于200位") + @Length(max = 200,message="备注不能大于200字") private String note; private String modifyPerson; @@ -63,4 +55,8 @@ public class CertificateInfo { private String delFlg; + @ApiModelProperty(value = "颁发日期") + @JsonFormat(pattern = "yyyyMMdd",timezone = "Asia/Shanghai") + private Date issueDate; + } \ No newline at end of file diff --git a/src/main/java/com/soft/line/entity/ContractInfo.java b/src/main/java/com/soft/line/entity/ContractInfo.java index f5b21f8..0018591 100644 --- a/src/main/java/com/soft/line/entity/ContractInfo.java +++ b/src/main/java/com/soft/line/entity/ContractInfo.java @@ -25,36 +25,39 @@ public class ContractInfo { @ApiModelProperty(value = "合同名称") @NotNull(message = "合同名称不能为空") - @Length(max = 200,message="合同名称不能大于200位") + @Length(max = 100,message="合同名称不能大于100位") private String contractName; - @ApiModelProperty(value = "部门ID") - @NotNull(message = "部门不能为空") - private String proId; + @ApiModelProperty(value = "合同类别") + @NotNull(message = "合同类别") + private String contractType; @ApiModelProperty(value = "总金额") @NotNull(message = "总金额不能为空") - //@DecimalMin("10000") private BigDecimal totalAmount; - @ApiModelProperty(value = "第一签约方") - @NotNull(message = "第一签约方不能为空") - @Length(max = 200,message="第一签约方不能大于200位") + @ApiModelProperty(value = "甲方") + @NotNull(message = "甲方不能为空") + @Length(max = 100,message="甲方不能大于100字") private String partA; - @ApiModelProperty(value = "第二签约方") - @NotNull(message = "第二签约方不能为空") - @Length(max = 200,message="第二签约方不能大于200位") + @ApiModelProperty(value = "乙方") + @NotNull(message = "乙方不能为空") + @Length(max = 100,message="乙方不能大于100字") private String partB; - @ApiModelProperty(value = "签约日期") - @NotNull(message = "签约日期不能为空") + @ApiModelProperty(value = "其他签约方") + @Length(max = 100,message="其他签约方不能大于100字") + private String partC; + + @ApiModelProperty(value = "合同有效日期") + @NotNull(message = "合同有效日期不能为空") @JsonFormat(pattern = "yyyyMMdd",timezone = "Asia/Shanghai") private Date signTime; @ApiModelProperty(value = "签约地点") @NotNull(message = "签约地点不能为空") - @Length(max = 200,message="签约地点不能大于200位") + @Length(max = 100,message="签约地点不能大于100位") private String signAddr; @ApiModelProperty(value = "开始时间") @@ -72,7 +75,7 @@ public class ContractInfo { private String payment; @ApiModelProperty(value = "备注") - @Length(max = 200,message="备注不能大于200位") + @Length(max = 200,message="备注不能大于200字") private String note; private String modifyPerson; @@ -82,8 +85,15 @@ public class ContractInfo { private String delFlg; - @ApiModelProperty(value = "合同类型") - @NotNull(message = "合同类型不能为空") - private String contractType; + @ApiModelProperty(value = "合同性质") + @NotNull(message = "合同性质不能为空") + private String contractNature; + + @ApiModelProperty(value = "项目编号") + @Length(max = 50,message="项目编号不能大于50字") + private String proId; + @ApiModelProperty(value = "合同内容") + @Length(max = 1000,message="合同内容不能大于1000字") + private String contractContent; } \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/CertificateInfoMapper.xml b/src/main/java/com/soft/line/mapper/CertificateInfoMapper.xml index b8f11e2..d2a5074 100644 --- a/src/main/java/com/soft/line/mapper/CertificateInfoMapper.xml +++ b/src/main/java/com/soft/line/mapper/CertificateInfoMapper.xml @@ -10,7 +10,7 @@ - + @@ -21,19 +21,19 @@ insert into `certificate_info` (`cert_id`, `cert_type`, `cert_name`, - `project_name`,`cert_unit`, `begin_date`, `end_date`, + `issue_date`,`cert_unit`, `begin_date`, `end_date`, `note`, `modify_person`) values (#{certId,jdbcType=VARCHAR}, #{certType,jdbcType=VARCHAR}, #{certName,jdbcType=VARCHAR}, - #{projectName,jdbcType=VARCHAR},#{certUnit,jdbcType=VARCHAR}, #{beginDate,jdbcType=TIMESTAMP}, #{endDate,jdbcType=TIMESTAMP}, + #{issueDate,jdbcType=TIMESTAMP},#{certUnit,jdbcType=VARCHAR}, #{beginDate,jdbcType=TIMESTAMP}, #{endDate,jdbcType=TIMESTAMP}, #{note,jdbcType=VARCHAR}, #{modifyPerson,jdbcType=VARCHAR}) insert into `certificate_info` (`cert_id`, `cert_type`, `cert_name`, - `project_name`,`cert_unit`, `begin_date`, `end_date`, + `issue_date`,`cert_unit`, `begin_date`, `end_date`, `note`, `modify_person`) values (#{certId,jdbcType=VARCHAR}, #{certType,jdbcType=VARCHAR}, #{certName,jdbcType=VARCHAR}, - #{projectName,jdbcType=VARCHAR},#{certUnit,jdbcType=VARCHAR}, #{beginDate,jdbcType=TIMESTAMP}, #{endDate,jdbcType=TIMESTAMP}, + #{issueDate,jdbcType=TIMESTAMP},#{certUnit,jdbcType=VARCHAR}, #{beginDate,jdbcType=TIMESTAMP}, #{endDate,jdbcType=TIMESTAMP}, #{note,jdbcType=VARCHAR}, #{modifyPerson,jdbcType=VARCHAR}) @@ -45,7 +45,7 @@ update `certificate_info` set `cert_id` = #{certId,jdbcType=VARCHAR}, `cert_type` = #{certType,jdbcType=VARCHAR}, `cert_name` = #{certName,jdbcType=VARCHAR}, - `project_name` = #{projectName,jdbcType=VARCHAR}, + `issue_date` = #{issueDate,jdbcType=TIMESTAMP}, `cert_unit` = #{certUnit,jdbcType=VARCHAR}, `begin_date` = #{beginDate,jdbcType=TIMESTAMP}, `end_Date` = #{endDate,jdbcType=TIMESTAMP}, @@ -56,14 +56,14 @@ select `id`, `cert_id`, - (select cd.code_content1 from code_detail cd where cd.code_type = 3 and cd.code_detail = `cert_type`) cert_type, - `cert_name`, `project_name`,`cert_unit`, `begin_date`, `end_date`, + (select cd.item_desc from las_codeitem cd where cd.item_type_id = 103 and cd.item_val = `cert_type`) cert_type, + `cert_name`, `issue_date`,`cert_unit`, `begin_date`, `end_date`, `note`, `modify_person`, `modify_time`, `del_flg` from `certificate_info` where `del_flg`!='1' @@ -145,7 +145,7 @@ SELECT - (select cd.code_content1 from code_detail cd where cd.code_type = 3 and cd.code_detail = `cert_type`) name, + (select cd.item_desc from las_codeitem cd where cd.item_type_id = 103 and cd.item_val = `cert_type`) name, count(*) total FROM certificate_info diff --git a/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml b/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml index 98e5e17..211812c 100644 --- a/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml +++ b/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml @@ -1,230 +1,243 @@ - - - - - - - - - - - - - - - - - - - - - - - - insert into `contract_info` (`dep_id`, `contract_name`, `pro_id`, - `total_amount`, `part_a`, `part_b`, - `sign_time`, `sign_addr`, `begin_date`, - `end_date`, `payment`, `note`, - `modify_person`,`contract_type` + + + + + + + + + + + + + + + + + + + + + + + + + + + insert into `contract_info` (`dep_id`, `contract_name`,`contract_type`, `pro_id`, + `total_amount`, `part_a`, `part_b`, `part_c`, + `sign_time`, `sign_addr`, `begin_date`, `end_date`, + `payment`, `note`,`modify_person`, + `contract_nature`,`contract_content` ) - values (#{depId,jdbcType=VARCHAR}, #{contractName,jdbcType=VARCHAR}, #{proId,jdbcType=VARCHAR}, - #{totalAmount,jdbcType=DECIMAL}, #{partA,jdbcType=VARCHAR}, #{partB,jdbcType=VARCHAR}, - #{signTime,jdbcType=TIMESTAMP}, #{signAddr,jdbcType=VARCHAR}, #{beginDate,jdbcType=TIMESTAMP}, - #{endDate,jdbcType=TIMESTAMP}, #{payment,jdbcType=VARCHAR}, #{note,jdbcType=VARCHAR}, - #{modifyPerson,jdbcType=VARCHAR},#{contractType,jdbcType=VARCHAR} + values (#{depId,jdbcType=DECIMAL}, #{contractName,jdbcType=VARCHAR},#{contractType,jdbcType=VARCHAR}, #{proId,jdbcType=VARCHAR}, + #{totalAmount,jdbcType=DECIMAL}, #{partA,jdbcType=VARCHAR}, #{partB,jdbcType=VARCHAR}, #{partB,jdbcType=VARCHAR}, + #{signTime,jdbcType=TIMESTAMP}, #{signAddr,jdbcType=VARCHAR}, #{beginDate,jdbcType=TIMESTAMP}, #{endDate,jdbcType=TIMESTAMP}, + #{payment,jdbcType=VARCHAR}, #{note,jdbcType=VARCHAR}, #{modifyPerson,jdbcType=VARCHAR}, + #{contractNature,jdbcType=VARCHAR},#{contractContent,jdbcType=VARCHAR} ) - - insert into `contract_info` (`dep_id`, `contract_name`, `pro_id`, - `total_amount`, `part_a`, `part_b`, - `sign_time`, `sign_addr`, `begin_date`, - `end_date`, `payment`, `note`, - `modify_person`,`contract_type` + + insert into `contract_info` (`dep_id`, `contract_name`,`contract_type`, `pro_id`, + `total_amount`, `part_a`, `part_b`, `part_c`, + `sign_time`, `sign_addr`, `begin_date`, `end_date`, + `payment`, `note`,`modify_person`, + `contract_nature`,`contract_content` ) - values (#{depId,jdbcType=VARCHAR}, #{contractName,jdbcType=VARCHAR}, #{proId,jdbcType=VARCHAR}, - #{totalAmount,jdbcType=DECIMAL}, #{partA,jdbcType=VARCHAR}, #{partB,jdbcType=VARCHAR}, - #{signTime,jdbcType=TIMESTAMP}, #{signAddr,jdbcType=VARCHAR}, #{beginDate,jdbcType=TIMESTAMP}, - #{endDate,jdbcType=TIMESTAMP}, #{payment,jdbcType=VARCHAR}, #{note,jdbcType=VARCHAR}, - #{modifyPerson,jdbcType=VARCHAR},#{contractType,jdbcType=VARCHAR} + values (#{depId,jdbcType=DECIMAL}, #{contractName,jdbcType=VARCHAR},#{contractType,jdbcType=VARCHAR}, #{proId,jdbcType=VARCHAR}, + #{totalAmount,jdbcType=DECIMAL}, #{partA,jdbcType=VARCHAR}, #{partB,jdbcType=VARCHAR}, #{partB,jdbcType=VARCHAR}, + #{signTime,jdbcType=TIMESTAMP}, #{signAddr,jdbcType=VARCHAR}, #{beginDate,jdbcType=TIMESTAMP}, #{endDate,jdbcType=TIMESTAMP}, + #{payment,jdbcType=VARCHAR}, #{note,jdbcType=VARCHAR}, #{modifyPerson,jdbcType=VARCHAR}, + #{contractNature,jdbcType=VARCHAR},#{contractContent,jdbcType=VARCHAR} ) - + update `contract_info` set `del_flg` = '1' where `id` = #{id,jdbcType=INTEGER} - - update `contract_info` set `dep_id` = #{depId,jdbcType=VARCHAR}, + + update `contract_info` set `dep_id` = #{depId,jdbcType=DECIMAL}, `contract_name` = #{contractName,jdbcType=VARCHAR}, + `contract_type` = #{contractType,jdbcType=VARCHAR}, `pro_id` = #{proId,jdbcType=VARCHAR}, `total_amount` = #{totalAmount,jdbcType=DECIMAL}, `part_a` = #{partA,jdbcType=VARCHAR}, `part_b` = #{partB,jdbcType=VARCHAR}, + `part_c` = #{partC,jdbcType=VARCHAR}, `sign_time` = #{signTime,jdbcType=TIMESTAMP}, `sign_addr` = #{signAddr,jdbcType=VARCHAR}, `begin_date` = #{beginDate,jdbcType=TIMESTAMP}, `end_date` = #{endDate,jdbcType=TIMESTAMP}, `payment` = #{payment,jdbcType=VARCHAR}, `note` = #{note,jdbcType=VARCHAR}, - `contract_type` = #{contractType,jdbcType=VARCHAR}, `modify_person` = #{modifyPerson,jdbcType=VARCHAR}, - `modify_time` = #{modifyTime,jdbcType=TIMESTAMP} + `modify_time` = #{modifyTime,jdbcType=TIMESTAMP}, + `contract_nature` = #{contractNature,jdbcType=VARCHAR}, + `contract_content` = #{contractContent,jdbcType=VARCHAR}, where `id` = #{id,jdbcType=INTEGER} - + - + - + - + - + - select SUBSTR(begin_date, 1, 4) x,count(*) y from contract_info where del_flg != 1 GROUP BY SUBSTR(begin_date, 1, 4) - select (select dep.depname from las_departmentinfo dep where dep.id = `dep_id`) x, count(*) y from contract_info where del_flg != 1 GROUP BY `dep_id` - select (select dep.depname from las_departmentinfo dep where dep.id = `dep_id`) x, count(*) y from contract_info where del_flg != 1 and SUBSTR(begin_date, 1,4)=YEAR(NOW()) GROUP BY `dep_id` - select SUBSTR(begin_date, 1, 4) x,sum(`total_amount`) y from contract_info where del_flg != 1 GROUP BY SUBSTR(begin_date, 1, 4) - select (select dep.depname from las_departmentinfo dep where dep.id = `dep_id`) x, sum(`total_amount`) y from contract_info where del_flg != 1 GROUP BY dep_id - + - select count(*) from contract_info t where SUBSTR(begin_date, 1,4)=YEAR(NOW()) and del_flg != 1 group by SUBSTR(begin_date, 1, 4) - SELECT SUBSTR(begin_date, 1, 4) x, count(*) y, @@ -238,13 +251,13 @@ contract_type - select t.contract_name name,t.total_amount total from contract_info t where del_flg != 1 order by total desc LIMIT 0,7 - select (select dep.depname from las_departmentinfo dep where dep.id = `dep_id`) name,count(*) total from contract_info t where del_flg=0 group by t.dep_id order by total desc LIMIT 0,6 -- Gitee From d6d36fbd8cfc3b3527ff811025477b24e2b2024f Mon Sep 17 00:00:00 2001 From: ljc Date: Tue, 24 Nov 2020 18:30:05 +0800 Subject: [PATCH 167/211] =?UTF-8?q?=E5=90=88=E5=90=8C=E3=80=81=E8=AF=81?= =?UTF-8?q?=E4=B9=A6=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5,=E5=B0=8F?= =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../line/mapper/AppletCertificateMapper.xml | 18 +++++----- .../soft/line/mapper/AppletContractMapper.xml | 35 +++++++++++-------- 2 files changed, 30 insertions(+), 23 deletions(-) diff --git a/src/main/java/com/soft/line/mapper/AppletCertificateMapper.xml b/src/main/java/com/soft/line/mapper/AppletCertificateMapper.xml index 6af51f0..202e6cf 100644 --- a/src/main/java/com/soft/line/mapper/AppletCertificateMapper.xml +++ b/src/main/java/com/soft/line/mapper/AppletCertificateMapper.xml @@ -66,7 +66,7 @@ cert_id certId, cert_type certType, cert_name certName, - project_name projectName, + SUBSTR(issue_date,1,11) issueDate, cert_unit certUnit, SUBSTR(begin_date,1,11) beginDate, SUBSTR(end_date,1,11) endDate, @@ -83,7 +83,7 @@ SET cert_id = #{certId}, cert_type = #{certType}, cert_name = #{certName}, - project_name = #{projectName}, + issue_date = #{issueDate}, cert_unit = #{certUnit}, begin_date = #{beginDate}, end_date = #{endDate}, @@ -120,7 +120,7 @@ cert_id certId, cert_type certType, cert_name certName, - project_name projectName, + issue_date issueDate, cert_unit certUnit, SUBSTR(begin_date,1,11) beginDate, SUBSTR(end_date,1,11) endDate, @@ -153,7 +153,7 @@ cert_id, cert_type, cert_name, - project_name, + issueDate, cert_unit, begin_date, end_date, @@ -169,7 +169,7 @@ #{certId}, #{certType}, #{certName}, - #{projectName}, + #{issueDate}, #{certUnit}, #{beginDate}, #{endDate}, @@ -203,8 +203,8 @@ and cert_id like concat('%',#{certId},'%') - - and project_name like concat('%',#{projectName},'%') + + and issue_date like concat('%',#{issueDate},'%') and cert_unit like concat('%',#{certUnit},'%') @@ -235,8 +235,8 @@ and cert_id like concat('%',#{certId},'%') - - and project_name like concat('%',#{projectName},'%') + + and issue_date like concat('%',#{issueDate},'%') and cert_unit like concat('%',#{certUnit},'%') diff --git a/src/main/java/com/soft/line/mapper/AppletContractMapper.xml b/src/main/java/com/soft/line/mapper/AppletContractMapper.xml index 605ac49..6b7f1a4 100644 --- a/src/main/java/com/soft/line/mapper/AppletContractMapper.xml +++ b/src/main/java/com/soft/line/mapper/AppletContractMapper.xml @@ -46,7 +46,7 @@ select - id id,contract_name contractName + id id,contract_name contractName, from contract_info where del_flg != 1 @@ -118,10 +118,9 @@ and pro_id = #{proId} - and part_a like concat('%',#{partA},'%') - - - and part_b like concat('%',#{partB},'%') + and (part_a like concat('%',#{partA},'%') + or part_b like concat('%',#{partA},'%') + or part_c like concat('%',#{partA},'%')) and sign_addr like concat('%',#{signAddr},'%') @@ -141,23 +140,25 @@ - insert into `contract_info` (`dep_id`, `contract_name`, `pro_id`, - `total_amount`, `part_a`, `part_b`, + insert into `contract_info` (`dep_id`, `contract_name`, `contract_type`, `pro_id`, + `total_amount`, `part_a`, `part_b`, `part_c`, `sign_time`, `sign_addr`, `begin_date`, `end_date`, `payment`, `note`, - `modify_person`, `modify_time`, `del_flg` + `modify_person`, `modify_time`, `del_flg`, + `contract_nature`,`contract_content` ) - values (#{depId,jdbcType=VARCHAR}, #{contractName,jdbcType=VARCHAR}, #{proId,jdbcType=VARCHAR}, + values (#{depId,jdbcType=DECIMAL}, #{contractName,jdbcType=VARCHAR}, #{contractType,jdbcType=VARCHAR}, #{proId,jdbcType=VARCHAR}, #{totalAmount,jdbcType=DECIMAL}, #{partA,jdbcType=VARCHAR}, #{partB,jdbcType=VARCHAR}, #{signTime,jdbcType=TIMESTAMP}, #{signAddr,jdbcType=VARCHAR}, #{beginDate,jdbcType=TIMESTAMP}, #{endDate,jdbcType=TIMESTAMP}, #{payment,jdbcType=VARCHAR}, #{note,jdbcType=VARCHAR}, - #{modifyPerson,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}, #{delFlg,jdbcType=CHAR} + #{modifyPerson,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}, #{delFlg,jdbcType=CHAR}, + #{contractNature,jdbcType=VARCHAR}, #{contractContent,jdbcType=VARCHAR} ) @@ -166,10 +167,12 @@ UPDATE contract_info set dep_id = #{depId} , contract_name = #{contractName} , + contract_type = #{contractType} , pro_id = #{proId} , total_amount = #{totalAmount} , part_a = #{partA} , part_b = #{partB} , + part_c = #{partC} , sign_time = #{signTime} , sign_addr = #{signAddr} , begin_date = #{beginDate} , @@ -178,6 +181,8 @@ note = #{note} , + contract_nature = #{contractNature}, + contract_content #{contractContent}, modify_person = #{modifyPerson} , modify_time = #{modifyTime} where id = #{id} @@ -185,13 +190,15 @@ -- Gitee From ac48f24640e90e94f7a75cef6070effac7e2fc3a Mon Sep 17 00:00:00 2001 From: wjd Date: Wed, 25 Nov 2020 09:24:36 +0800 Subject: [PATCH 168/211] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E7=AE=A1=E7=90=86=20?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E5=A4=B1=E8=B4=A5=E8=BF=94=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/soft/line/controller/MenuInfoController.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/soft/line/controller/MenuInfoController.java b/src/main/java/com/soft/line/controller/MenuInfoController.java index 4e7e827..61e2874 100644 --- a/src/main/java/com/soft/line/controller/MenuInfoController.java +++ b/src/main/java/com/soft/line/controller/MenuInfoController.java @@ -65,23 +65,23 @@ public class MenuInfoController { MenuInfo menuInfo = new MenuInfo(); menuInfo.setId((Integer) map.get("id")); if (map.get("menuName")==null||"".equals((String)map.get("menuName"))){ - return CommonResult.success("菜单名称不能为空"); + return CommonResult.failed("菜单名称不能为空"); }else{ //新增时判断menuName是否重复 menuInfo.setMenuName(map.get("menuName").toString()); if (menuInfoService.countMenuName(menuInfo.getId(),menuInfo.getMenuName())>0){ - return CommonResult.success("菜单名称已存在"); + return CommonResult.failed("菜单名称已存在"); } } menuInfo.setMenuIcon(map.get("menuIcon")==null?"":map.get("menuIcon").toString()); menuInfo.setMenuUrl(map.get("menuUrl")==null?"":map.get("menuUrl").toString()); if (map.get("orderBy")==null){ - return CommonResult.success("菜单排序不能为空"); + return CommonResult.failed("菜单排序不能为空"); }else{ menuInfo.setOrderBy((map.get("orderBy")==null?"":map.get("orderBy").toString())); if (menuInfoService.countOrderBy(menuInfo.getId(),menuInfo.getOrderBy())>0){ - return CommonResult.success("菜单排序已存在"); + return CommonResult.failed("菜单排序已存在"); } } @@ -92,7 +92,7 @@ public class MenuInfoController { }else { MenuInfo pMenu = menuInfoService.selectParentMenu(menuInfo.getpId()); if (pMenu==null){ - return CommonResult.success("父级菜单不存在"); + return CommonResult.failed("父级菜单不存在"); } menuInfo.setState(pMenu.getState()+1); } -- Gitee From 601b66154acec03af879fbbeaf5883339c5c8842 Mon Sep 17 00:00:00 2001 From: ljc Date: Wed, 25 Nov 2020 15:42:50 +0800 Subject: [PATCH 169/211] =?UTF-8?q?=E9=85=8D=E7=BD=AElas=5Fcodeitem?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../line/controller/CodeDetailController.java | 5 +- .../line/controller/CommonController.java | 15 +- .../com/soft/line/entity/LasCodeItem.java | 33 +++ .../soft/line/mapper/ContractInfoMapper.xml | 40 +-- .../soft/line/mapper/LasCodeItemMapper.java | 30 ++ .../soft/line/mapper/LasCodeItemMapper.xml | 42 +++ .../soft/line/service/CodeDetailService.java | 11 +- .../service/impl/CodeDetailServiceImpl.java | 21 +- .../java/com/soft/line/util/poi/PoiUtils.java | 279 +++++++++++------- 9 files changed, 313 insertions(+), 163 deletions(-) create mode 100644 src/main/java/com/soft/line/entity/LasCodeItem.java create mode 100644 src/main/java/com/soft/line/mapper/LasCodeItemMapper.java create mode 100644 src/main/java/com/soft/line/mapper/LasCodeItemMapper.xml diff --git a/src/main/java/com/soft/line/controller/CodeDetailController.java b/src/main/java/com/soft/line/controller/CodeDetailController.java index 7ab4aa0..fda4321 100644 --- a/src/main/java/com/soft/line/controller/CodeDetailController.java +++ b/src/main/java/com/soft/line/controller/CodeDetailController.java @@ -1,7 +1,6 @@ package com.soft.line.controller; -import com.soft.line.entity.CodeDetail; -import com.soft.line.entity.MenuButtonInfo; +import com.soft.line.entity.LasCodeItem; import com.soft.line.service.CodeDetailService; import com.soft.line.util.exception.CommonResult; import io.swagger.annotations.Api; @@ -29,7 +28,7 @@ public class CodeDetailController { @ApiImplicitParam(name = "codeType", value = "codeType", required = true, dataType = "String", paramType = "path") }) @GetMapping("codeDetail/{codeType}") - public CommonResult> getCodeDetailByCodeType(@PathVariable("codeType") String codeType) { + public CommonResult> getCodeDetailByCodeType(@PathVariable("codeType") String codeType) { return CommonResult.success(codeDetailService.selectByCodeType(codeType)); } } diff --git a/src/main/java/com/soft/line/controller/CommonController.java b/src/main/java/com/soft/line/controller/CommonController.java index 284b8ac..4f603e1 100644 --- a/src/main/java/com/soft/line/controller/CommonController.java +++ b/src/main/java/com/soft/line/controller/CommonController.java @@ -34,13 +34,13 @@ public class CommonController { @Autowired private RoleInfoService roleInfoService; - @ApiOperation(value = "获取枚举值codeDetail") + @ApiOperation(value = "获取枚举值lasCodeItem") @ApiImplicitParams({ - @ApiImplicitParam(name = "codeType", value = "codeType", required = true, dataType = "String", paramType = "path") + @ApiImplicitParam(name = "itemTypeId", value = "itemTypeId", required = true, dataType = "String", paramType = "path") }) - @GetMapping("codeDetail/{codeType}") - public CommonResult> getCodeDetailByCodeType(@PathVariable("codeType") String codeType) { - return CommonResult.success(codeDetailService.selectByCodeType(codeType)); + @GetMapping("lasCodeItem/{itemTypeId}") + public CommonResult> getCodeDetailByCodeType(@PathVariable("itemTypeId") String itemTypeId) { + return CommonResult.success(codeDetailService.selectByCodeType(itemTypeId)); } @GetMapping("/buttons") @@ -67,11 +67,6 @@ public class CommonController { return CommonResult.success(roleInfoService.selectAll()); } - /*@GetMapping("getDepByRole") - @ApiOperation(value = "根据角色获取部门") - public CommonResult> getDepByRole() { - return CommonResult.success(codeDetailService.getDepByRole()); - }*/ @GetMapping("getDepByRole") @ApiOperation(value = "根据角色获取部门") diff --git a/src/main/java/com/soft/line/entity/LasCodeItem.java b/src/main/java/com/soft/line/entity/LasCodeItem.java new file mode 100644 index 0000000..43acf6b --- /dev/null +++ b/src/main/java/com/soft/line/entity/LasCodeItem.java @@ -0,0 +1,33 @@ +package com.soft.line.entity; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; + +@Data +@NoArgsConstructor +@AllArgsConstructor +public class LasCodeItem { + + @ApiModelProperty(value = "类别ID") + private Long itemTypeId; + + @ApiModelProperty(value = "类别描述") + private String itemTypeDesc; + + @ApiModelProperty(value = "代码项值") + private String itemVal; + + @ApiModelProperty(value = "代码项描述") + private String itemDesc; + + @JsonFormat(pattern = "yyyyMMdd",timezone = "Asia/Shanghai") + private Date createTime; + + @JsonFormat(pattern = "yyyyMMdd",timezone = "Asia/Shanghai") + private Date updateTime; +} diff --git a/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml b/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml index 211812c..96b8792 100644 --- a/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml +++ b/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml @@ -97,55 +97,57 @@ + select * + from `las_codeitem` + where `item_type_id` = #{itemTypeId,jdbcType=VARCHAR} + and `item_val` = #{itemVal,jdbcType=VARCHAR} + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/soft/line/service/CodeDetailService.java b/src/main/java/com/soft/line/service/CodeDetailService.java index bb17507..661ae0c 100644 --- a/src/main/java/com/soft/line/service/CodeDetailService.java +++ b/src/main/java/com/soft/line/service/CodeDetailService.java @@ -1,21 +1,18 @@ package com.soft.line.service; import com.soft.line.entity.CodeDetail; +import com.soft.line.entity.LasCodeItem; import com.soft.line.entity.LasDepartmentInfo; import java.util.List; public interface CodeDetailService { - public CodeDetail selectByPrimaryKey(String codeType, String codeDetail); + public LasCodeItem selectByPrimaryKey(String itemTypeId, String itemVal); - public String selectContent1ByPrimaryKey(String codeType, String codeDetail); + public LasCodeItem selectByItemDesc(String itemTypeId, String itemDesc); - public CodeDetail selectByCodeContent1(String codeType, String codeContent1); - - public List selectByCodeType(String codeType); - - // public List getDepByRole(); + public List selectByCodeType(String codeType); public List getDepByRole(); diff --git a/src/main/java/com/soft/line/service/impl/CodeDetailServiceImpl.java b/src/main/java/com/soft/line/service/impl/CodeDetailServiceImpl.java index 51a86c5..a56288c 100644 --- a/src/main/java/com/soft/line/service/impl/CodeDetailServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/CodeDetailServiceImpl.java @@ -1,10 +1,12 @@ package com.soft.line.service.impl; import com.soft.line.entity.CodeDetail; +import com.soft.line.entity.LasCodeItem; import com.soft.line.entity.LasDepartmentInfo; import com.soft.line.filter.HttpRequestUtil; import com.soft.line.filter.UserTokenDto; import com.soft.line.mapper.CodeDetailMapper; +import com.soft.line.mapper.LasCodeItemMapper; import com.soft.line.mapper.LasDepartmentInfoMapper; import com.soft.line.mapper.RoleInfoMapper; import com.soft.line.service.CodeDetailService; @@ -21,28 +23,25 @@ public class CodeDetailServiceImpl implements CodeDetailService { @Autowired private CodeDetailMapper codeDetailMapper; @Autowired + private LasCodeItemMapper lasCodeItemMapper; + @Autowired private RoleInfoMapper roleInfoMapper; @Autowired private LasDepartmentInfoMapper lasDepartmentInfoMapper; @Override - public CodeDetail selectByPrimaryKey(String codeType, String codeDetail) { - return codeDetailMapper.selectByPrimaryKey(codeType,codeDetail); - } - - @Override - public String selectContent1ByPrimaryKey(String codeType, String codeDetail) { - return codeDetailMapper.selectContent1ByPrimaryKey(codeType,codeDetail); + public LasCodeItem selectByPrimaryKey(String itemTypeId, String itemVal) { + return lasCodeItemMapper.selectByPrimaryKey(itemTypeId,itemVal); } @Override - public CodeDetail selectByCodeContent1(String codeType, String codeContent1) { - return codeDetailMapper.selectByCodeContent1(codeType,codeContent1); + public LasCodeItem selectByItemDesc(String itemTypeId, String itemDesc) { + return lasCodeItemMapper.selectByItemDesc(itemTypeId,itemDesc); } @Override - public List selectByCodeType(String codeType) { - return codeDetailMapper.selectByCodeType(codeType); + public List selectByCodeType(String itemTypeId) { + return lasCodeItemMapper.selectByCodeType(itemTypeId); } /*@Override diff --git a/src/main/java/com/soft/line/util/poi/PoiUtils.java b/src/main/java/com/soft/line/util/poi/PoiUtils.java index 1cac22e..d14b1ec 100644 --- a/src/main/java/com/soft/line/util/poi/PoiUtils.java +++ b/src/main/java/com/soft/line/util/poi/PoiUtils.java @@ -1,9 +1,6 @@ package com.soft.line.util.poi; -import com.soft.line.entity.CertificateInfo; -import com.soft.line.entity.CodeDetail; -import com.soft.line.entity.ContractInfo; -import com.soft.line.entity.LasDepartmentInfo; +import com.soft.line.entity.*; import com.soft.line.service.CertificateInfoService; import com.soft.line.service.CodeDetailService; import com.soft.line.service.ContractInfoService; @@ -42,40 +39,40 @@ public class PoiUtils { //创建标题行 HSSFRow r0 = sheet.createRow(0); HSSFCell c0 = r0.createCell(0); - c0.setCellValue("证书类型"); + c0.setCellValue("证书编号"); c0.setCellStyle(headerStyle); HSSFCell c1 = r0.createCell(1); c1.setCellStyle(headerStyle); - c1.setCellValue("证书名称"); + c1.setCellValue("证书类型"); HSSFCell c2 = r0.createCell(2); c2.setCellStyle(headerStyle); - c2.setCellValue("项目名称"); + c2.setCellValue("证书名称"); HSSFCell c3 = r0.createCell(3); c3.setCellStyle(headerStyle); - c3.setCellValue("颁奖单位"); + c3.setCellValue("颁发单位"); HSSFCell c4 = r0.createCell(4); c4.setCellStyle(headerStyle); - c4.setCellValue("证书编号"); + c4.setCellValue("起始日期"); HSSFCell c5 = r0.createCell(5); c5.setCellStyle(headerStyle); - c5.setCellValue("发证日期"); + c5.setCellValue("终止日期"); HSSFCell c6 = r0.createCell(6); c6.setCellStyle(headerStyle); - c6.setCellValue("到期日期"); + c6.setCellValue("备注"); HSSFCell c7 = r0.createCell(7); c7.setCellStyle(headerStyle); - c7.setCellValue("备注"); + c7.setCellValue("颁发日期"); for (int i = 0; i < list.size(); i++) { CertificateInfo cert = list.get(i); HSSFRow row = sheet.createRow(i + 1); - row.createCell(0).setCellValue(cert.getCertType()); - row.createCell(1).setCellValue(cert.getCertName()); - row.createCell(2).setCellValue(cert.getProjectName()); + row.createCell(0).setCellValue(cert.getCertId()); + row.createCell(1).setCellValue(cert.getCertType()); + row.createCell(2).setCellValue(cert.getCertName()); row.createCell(3).setCellValue(cert.getCertUnit()); - row.createCell(4).setCellValue(cert.getCertId()); - row.createCell(5).setCellValue(dateToString(cert.getBeginDate())); - row.createCell(6).setCellValue(dateToString(cert.getEndDate())); - row.createCell(7).setCellValue(cert.getNote()); + row.createCell(4).setCellValue(dateToString(cert.getBeginDate())); + row.createCell(5).setCellValue(dateToString(cert.getEndDate())); + row.createCell(6).setCellValue(cert.getNote()); + row.createCell(7).setCellValue(dateToString(cert.getIssueDate())); } ByteArrayOutputStream baos = new ByteArrayOutputStream(); try { @@ -120,52 +117,68 @@ public class PoiUtils { c0.setCellStyle(headerStyle); HSSFCell c1 = r0.createCell(1); c1.setCellStyle(headerStyle); - c1.setCellValue("项目类型"); + c1.setCellValue("合同名称"); HSSFCell c2 = r0.createCell(2); c2.setCellStyle(headerStyle); - c2.setCellValue("合同名称"); + c2.setCellValue("合同类别"); HSSFCell c3 = r0.createCell(3); c3.setCellStyle(headerStyle); - c3.setCellValue("第一签约方"); + c3.setCellValue("项目编号"); HSSFCell c4 = r0.createCell(4); c4.setCellStyle(headerStyle); - c4.setCellValue("第二签约方"); + c4.setCellValue("总金额"); HSSFCell c5 = r0.createCell(5); c5.setCellStyle(headerStyle); - c5.setCellValue("签约地点"); + c5.setCellValue("甲方"); HSSFCell c6 = r0.createCell(6); c6.setCellStyle(headerStyle); - c6.setCellValue("签约日期"); + c6.setCellValue("乙方"); HSSFCell c7 = r0.createCell(7); c7.setCellStyle(headerStyle); - c7.setCellValue("起始日期"); + c7.setCellValue("其他签约方"); HSSFCell c8 = r0.createCell(8); c8.setCellStyle(headerStyle); - c8.setCellValue("终止日期"); + c8.setCellValue("合同有效日期"); HSSFCell c9 = r0.createCell(9); c9.setCellStyle(headerStyle); - c9.setCellValue("总金额"); + c9.setCellValue("签约地点"); HSSFCell c10 = r0.createCell(10); c10.setCellStyle(headerStyle); - c10.setCellValue("付款方式"); + c10.setCellValue("起始日期"); HSSFCell c11 = r0.createCell(11); c11.setCellStyle(headerStyle); - c11.setCellValue("备注"); + c11.setCellValue("终止日期"); + HSSFCell c12 = r0.createCell(12); + c12.setCellStyle(headerStyle); + c12.setCellValue("付款方式"); + HSSFCell c13 = r0.createCell(13); + c13.setCellStyle(headerStyle); + c13.setCellValue("备注"); + HSSFCell c14 = r0.createCell(14); + c14.setCellStyle(headerStyle); + c14.setCellValue("合同性质"); + HSSFCell c15 = r0.createCell(15); + c15.setCellStyle(headerStyle); + c15.setCellValue("合同内容"); for (int i = 0; i < list.size(); i++) { ContractInfo cont = list.get(i); HSSFRow row = sheet.createRow(i + 1); row.createCell(0).setCellValue(cont.getDepId()); - row.createCell(1).setCellValue(cont.getProId()); - row.createCell(2).setCellValue(cont.getContractName()); - row.createCell(3).setCellValue(cont.getPartA()); - row.createCell(4).setCellValue(cont.getPartB()); - row.createCell(5).setCellValue(cont.getSignAddr()); - row.createCell(6).setCellValue(dateToString(cont.getSignTime())); - row.createCell(7).setCellValue(dateToString(cont.getBeginDate())); - row.createCell(8).setCellValue(dateToString(cont.getEndDate())); - row.createCell(9).setCellValue(cont.getTotalAmount().toString()); - row.createCell(10).setCellValue(cont.getPayment()); - row.createCell(11).setCellValue(cont.getNote()); + row.createCell(1).setCellValue(cont.getContractName()); + row.createCell(2).setCellValue(cont.getContractType()); + row.createCell(3).setCellValue(cont.getProId()); + row.createCell(4).setCellValue(cont.getTotalAmount().toString()); + row.createCell(5).setCellValue(cont.getPartA()); + row.createCell(6).setCellValue(cont.getPartB()); + row.createCell(7).setCellValue(cont.getPartC()); + row.createCell(8).setCellValue(dateToString(cont.getSignTime())); + row.createCell(9).setCellValue(cont.getSignAddr()); + row.createCell(10).setCellValue(dateToString(cont.getBeginDate())); + row.createCell(11).setCellValue(dateToString(cont.getEndDate())); + row.createCell(12).setCellValue(cont.getPayment()); + row.createCell(13).setCellValue(cont.getNote()); + row.createCell(14).setCellValue(cont.getContractNature()); + row.createCell(15).setCellValue(cont.getContractContent()); } ByteArrayOutputStream baos = new ByteArrayOutputStream(); try { @@ -237,18 +250,28 @@ public class PoiUtils { Cell cell = row.getCell(k); cell.setCellType(CellType.STRING); String cellValue = cell.getStringCellValue(); - CodeDetail cd = null; + LasCodeItem lasCodeItem = null; switch (k) { case 0: + //证书编号 + if (cellValue == null || "".equals(cellValue)) { + warningMsg += "第" + j + "行证书编号为空 " ; + }else if(certificateInfoService.countByCId(null, cellValue) > 0){ + warningMsg += "第" + j + "行存在相同的证书编号 " ; + } else { + cert.setCertId(cellValue); + } + break; + case 1: //证书类型 - cd = codeDetailService.selectByCodeContent1("3",cellValue); - if (cd==null){ + lasCodeItem = codeDetailService.selectByItemDesc("103",cellValue); + if (lasCodeItem==null){ warningMsg+="第"+j+"行证书类型不存在 "; }else{ - cert.setCertType(cd.getCodeDetail()); + cert.setCertType(lasCodeItem.getItemVal()); } break; - case 1: + case 2: //证书名称 if (cellValue==null||"".equals(cellValue)){ warningMsg+="第"+j+"行证书名称不存在 "; @@ -256,29 +279,15 @@ public class PoiUtils { cert.setCertName(cellValue); } break; - case 2: - //项目名称 - cert.setProjectName(cellValue); - break; case 3: - //颁奖单位 + //颁发单位 if (cellValue == null || "".equals(cellValue)) { - warningMsg += "第" + j + "行颁奖单位为空 " ; + warningMsg += "第" + j + "行发奖单位为空 " ; } else { cert.setCertUnit(cellValue); } break; case 4: - //证书编号 - if (cellValue == null || "".equals(cellValue)) { - warningMsg += "第" + j + "行证书编号为空 " ; - }else if(certificateInfoService.countByCId(null, cellValue) > 0){ - warningMsg += "第" + j + "行存在相同的证书编号 " ; - } else { - cert.setCertId(cellValue); - } - break; - case 5: //发证日期 if(!isDate(cellValue)){ warningMsg += "第" + j + "行发证日期格式错误!日期样式：【20100101】" ; @@ -286,23 +295,31 @@ public class PoiUtils { cert.setBeginDate(StringToDate(cellValue)); } break; - case 6: + case 5: //到期日期 if (!isDate(cellValue)) { warningMsg += "第" + j + "行到期日期格式错误!日期样式：【20100101】"; - } else { - cert.setEndDate(StringToDate(cellValue)); } - if (cert.getBeginDate() != null && cert.getEndDate() != null) { + else if (cert.getBeginDate() != null && cert.getEndDate() != null) { if (cert.getBeginDate().after(cert.getEndDate())) { warningMsg += "第" + j + "行发证日期大于到期日期 "; } + }else { + cert.setEndDate(StringToDate(cellValue)); } break; - case 7: + case 6: //备注 cert.setNote(cellValue); break; + case 7: + //颁发日期 + if (cellValue!=null && !"".equals(cellValue) && !isDate(cellValue)) { + warningMsg += "第" + j + "行颁发日期格式错误!日期样式：【20100101】"; + }else { + cert.setIssueDate(StringToDate(cellValue)); + } + break; } } certificateInfoList.add(cert); @@ -360,16 +377,10 @@ public class PoiUtils { Cell cell = row.getCell(k); cell.setCellType(CellType.STRING); String cellValue = cell.getStringCellValue(); - CodeDetail cd = null; + LasCodeItem lasCodeItem = null; switch (k) { case 0: //部门 - /*cd = codeDetailService.selectByCodeContent1("1",cellValue); - if (cd==null){ - warningMsg+="第"+j+"行部门不存在 "; - }else{ - cont.setDepId(cd.getCodeDetail()); - }*/ LasDepartmentInfo dp = codeDetailService.selectSuperiorDepByDepName(cellValue); if (dp==null){ warningMsg+="第"+j+"行部门不存在 "; @@ -378,58 +389,86 @@ public class PoiUtils { } break; case 1: - //项目类型 - cd = codeDetailService.selectByCodeContent1("2",cellValue); - if (cd==null){ - warningMsg+="第"+j+"行项目类型不存在 "; - }else{ - cont.setProId(cd.getCodeDetail()); - } - break; - case 2: //合同名称 if(cellValue==null||"".equals(cellValue)){ warningMsg+="第"+j+"行合同名称为空 "; }else if(contractInfoService.countContractByIdAndName(null,cellValue)>0){ warningMsg+="第"+j+"行存在相同的合同名称 "; + }else if(cellValue.length()>100){ + warningMsg+="第"+j+"行合同名称应不大于100字 "; } else{ cont.setContractName(cellValue); } break; + case 2: + //合同类别 + lasCodeItem = codeDetailService.selectByItemDesc("102",cellValue); + if (lasCodeItem==null){ + warningMsg+="第"+j+"行合同类别不存在 "; + }else{ + cont.setContractType(lasCodeItem.getItemVal()); + } + break; case 3: - //第一签约方 + //项目编号 + cont.setProId(cellValue); + break; + case 4: + //总金额 if (cellValue == null || "".equals(cellValue)) { - warningMsg += "第" + j + "行第一签约方为空 " ; - } else { + warningMsg += "第" + j + "行总金额为空 " ; + } else if(!isNumber(cellValue)){ + warningMsg += "第" + j + "行总金额不是数字 " ; + }else { + cont.setTotalAmount(new BigDecimal(StringToDoubleUtil.convert(cellValue))); + } + break; + case 5: + //甲方 + if (cellValue == null || "".equals(cellValue)) { + warningMsg += "第" + j + "行甲方为空 " ; + } else if(cellValue.length()>100){ + warningMsg+="第"+j+"行甲方名称应不大于100字 "; + }else { cont.setPartA(cellValue); } break; - case 4: - //第二签约方 + case 6: + //乙方 if (cellValue == null || "".equals(cellValue)) { - warningMsg += "第" + j + "行第二签约方为空 " ; + warningMsg += "第" + j + "行乙方为空 " ; + }else if(cellValue.length()>100){ + warningMsg+="第"+j+"行合乙方称应不大于100字 "; } else { cont.setPartB(cellValue); } break; - case 5: - //签约地点 - if (cellValue == null || "".equals(cellValue)) { - warningMsg += "第" + j + "行签约地点为空" ; + case 7: + //其他签约方 + if (cellValue != null && !"".equals(cellValue) && cellValue.length() > 100) { + warningMsg += "第" + j + "行其他签约方名称应不大于100字 "; } else { - cont.setSignAddr(cellValue); + cont.setPartC(cellValue); } break; - case 6: - //签约日期 + case 8: + //合同有效日期 if(!isDate(cellValue)){ - warningMsg += "第" + j + "行签约日期格式错误!日期样式：【20100101】" ; + warningMsg += "第" + j + "行合同有效日期格式错误!日期样式：【20100101】" ; }else{ cont.setSignTime(StringToDate(cellValue)); } break; - case 7: + case 9: + //签约地点 + if (cellValue == null || "".equals(cellValue)) { + warningMsg += "第" + j + "行签约地点为空" ; + } else { + cont.setSignAddr(cellValue); + } + break; + case 10: //起始日期 if(!isDate(cellValue)){ warningMsg += "第" + j + "行起始日期格式错误!日期样式：【20100101】" ; @@ -437,7 +476,7 @@ public class PoiUtils { cont.setBeginDate(StringToDate(cellValue)); } break; - case 8: + case 11: //终止日期 if(!isDate(cellValue)){ warningMsg += "第" + j + "行终止日期格式错误!日期样式：【20100101】" ; @@ -450,27 +489,41 @@ public class PoiUtils { } } break; - case 9: - //总金额 - if (cellValue == null || "".equals(cellValue)) { - warningMsg += "第" + j + "行总金额为空 " ; - } else if(!isNumber(cellValue)){ - warningMsg += "第" + j + "行总金额不是数字 " ; - }else { - cont.setTotalAmount(new BigDecimal(StringToDoubleUtil.convert(cellValue))); - } - break; - case 10: + + case 12: //付款方式 if (cellValue == null || "".equals(cellValue)) { warningMsg += "第" + j + "行付款方式为空 " ; - } else { + } else if(cellValue.length()>500){ + warningMsg += "第" + j + "行付款方式应不大于500字 " ; + }else { cont.setPayment(cellValue); } break; - case 11: + case 13: //备注 - cont.setNote(cellValue); + if (cellValue != null && !"".equals(cellValue) && cellValue.length() > 1000) { + warningMsg += "第" + j + "行备注应不大于1000字 "; + } else { + cont.setNote(cellValue); + } + break; + case 14: + //合同性质 + lasCodeItem = codeDetailService.selectByItemDesc("104",cellValue); + if (lasCodeItem==null){ + warningMsg+="第"+j+"行合同性质不存在 "; + }else{ + cont.setContractNature(lasCodeItem.getItemVal()); + } + break; + case 15: + //合同内容 + if (cellValue != null && !"".equals(cellValue) && cellValue.length() > 1000) { + warningMsg += "第" + j + "行合同内容应不大于1000字 "; + } else { + cont.setNote(cellValue); + } break; } } -- Gitee From 272269b7b94e5428506cc68abff2c4007ba4c153 Mon Sep 17 00:00:00 2001 From: ljc Date: Wed, 25 Nov 2020 16:39:24 +0800 Subject: [PATCH 170/211] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E5=90=88?= =?UTF-8?q?=E5=90=8C=E3=80=81=E8=AF=81=E4=B9=A6=E6=96=B0=E5=A2=9E=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppletCertificateController.java | 3 - .../soft/line/entity/AppletCertificate.java | 8 +- .../com/soft/line/entity/AppletContract.java | 22 ++- .../com/soft/line/entity/CertificateInfo.java | 1 - .../line/mapper/AppletCertificateMapper.xml | 154 +++++++++--------- .../soft/line/mapper/AppletCommonMapper.xml | 11 +- .../soft/line/mapper/AppletContractMapper.xml | 33 ++-- .../soft/line/mapper/ContractInfoMapper.xml | 2 +- .../impl/AppletCertificateServiceImpl.java | 3 +- .../impl/AppletContractServiceImpl.java | 3 +- .../java/com/soft/line/util/poi/PoiUtils.java | 10 +- 11 files changed, 130 insertions(+), 120 deletions(-) diff --git a/src/main/java/com/soft/line/controller/AppletCertificateController.java b/src/main/java/com/soft/line/controller/AppletCertificateController.java index 24d5657..2d5bd31 100644 --- a/src/main/java/com/soft/line/controller/AppletCertificateController.java +++ b/src/main/java/com/soft/line/controller/AppletCertificateController.java @@ -64,9 +64,6 @@ public class AppletCertificateController { if (!StringUtils.hasText(paramMap.get(AppletSystemConstant.CERT_TYPE).toString())) { return AjaxResult.error("证书类型不为空"); } - /*if (!StringUtils.hasText(paramMap.get(AppletSystemConstant.BEGIN_DATE).toString())) { - return AjaxResult.error("选择的不存在"); - }*/ if (!StringUtils.hasText(String.valueOf(paramMap.get(AppletSystemConstant.PAGE_NUM)))) { return AjaxResult.error("第几页不能为空"); } diff --git a/src/main/java/com/soft/line/entity/AppletCertificate.java b/src/main/java/com/soft/line/entity/AppletCertificate.java index 22f5ede..379bd81 100644 --- a/src/main/java/com/soft/line/entity/AppletCertificate.java +++ b/src/main/java/com/soft/line/entity/AppletCertificate.java @@ -20,7 +20,6 @@ public class AppletCertificate { private Integer id; - @NotBlank private String certId; @NotBlank @@ -28,7 +27,7 @@ public class AppletCertificate { private String certType; @NotBlank - @Size(max = 200) + @Size(max = 100) private String certName; @NotBlank @@ -39,14 +38,15 @@ public class AppletCertificate { @Size(max = 200) private String certUnit; - @NotNull @JsonFormat(pattern = "yyyy-MM-dd",timezone = "Asia/Shanghai") private Date beginDate; - @NotNull @JsonFormat(pattern = "yyyy-MM-dd",timezone = "Asia/Shanghai") private Date endDate; + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "Asia/Shanghai") + private Date issueDate; + @Size(max = 200) private String note; diff --git a/src/main/java/com/soft/line/entity/AppletContract.java b/src/main/java/com/soft/line/entity/AppletContract.java index 9c2a079..4e7db3e 100644 --- a/src/main/java/com/soft/line/entity/AppletContract.java +++ b/src/main/java/com/soft/line/entity/AppletContract.java @@ -29,26 +29,32 @@ public class AppletContract { private String contractName; @NotBlank - @Size(max = 200) + private String contractType; + + @Size(max = 50) private String proId; @NotNull private BigDecimal totalAmount; @NotBlank - @Size(max = 200) + @Size(max = 100) private String partA; @NotBlank - @Size(max = 200) + @Size(max = 100) private String partB; + @NotBlank + @Size(max = 100) + private String partC; + @NotNull @JsonFormat(pattern = "yyyy-MM-dd",timezone = "Asia/Shanghai") private Date signTime; @NotBlank - @Size(max = 200) + @Size(max = 100) private String signAddr; @NotNull @@ -63,7 +69,7 @@ public class AppletContract { @Size(max = 200) private String payment; - @Size(max = 200) + @Size(max = 1000) private String note; @NotBlank @@ -74,5 +80,11 @@ public class AppletContract { private String delFlg; + @NotBlank + private String contractNature; + + @Size(max = 1000) + private String contractContent; + private List deleteAttachmentList; } diff --git a/src/main/java/com/soft/line/entity/CertificateInfo.java b/src/main/java/com/soft/line/entity/CertificateInfo.java index 9453eb0..fac9922 100644 --- a/src/main/java/com/soft/line/entity/CertificateInfo.java +++ b/src/main/java/com/soft/line/entity/CertificateInfo.java @@ -19,7 +19,6 @@ public class CertificateInfo { private Integer id; @ApiModelProperty(value = "证书ID") - @NotNull(message = "证书ID不能为空") @Length(max = 200,message="证书ID不能大于200位") private String certId; diff --git a/src/main/java/com/soft/line/mapper/AppletCertificateMapper.xml b/src/main/java/com/soft/line/mapper/AppletCertificateMapper.xml index 202e6cf..266ea8c 100644 --- a/src/main/java/com/soft/line/mapper/AppletCertificateMapper.xml +++ b/src/main/java/com/soft/line/mapper/AppletCertificateMapper.xml @@ -26,31 +26,25 @@ @@ -116,19 +110,19 @@ SELECT - count(id) num + count(id) num FROM certificate_info WHERE @@ -150,36 +144,36 @@ INSERT INTO certificate_info ( - cert_id, - cert_type, - cert_name, - issueDate, - cert_unit, - begin_date, - end_date, - - note, - - modify_person, - modify_time, - del_flg + cert_id, + cert_type, + cert_name, + issue_date, + cert_unit, + begin_date, + end_date, + + note, + + modify_person, + modify_time, + del_flg ) VALUES - ( - #{certId}, - #{certType}, - #{certName}, - #{issueDate}, - #{certUnit}, - #{beginDate}, - #{endDate}, - - #{note}, - - #{modifyPerson}, - NOW(), - 0 - ) + ( + #{certId}, + #{certType}, + #{certName}, + #{issueDate}, + #{certUnit}, + #{beginDate}, + #{endDate}, + + #{note}, + + #{modifyPerson}, + NOW(), + 0 + ) SELECT - id id, - cert_name certificateName + id id, + cert_name certificateName FROM - certificate_info + certificate_info WHERE - del_flg != 1 + del_flg != 1 and cert_type like concat('%',#{certType},'%') and cert_id like concat('%',#{certId},'%') - - and issue_date like concat('%',#{issueDate},'%') + + and SUBSTR(issue_date,1,11) >= #{issueDate} + + + and SUBSTR(issue_date,1,11) <= #{issueDate} and cert_unit like concat('%',#{certUnit},'%') @@ -224,7 +221,7 @@ select - code_type codeType,code_detail codeDetail,code_content1 codeContent1 - from code_detail where code_type <> '1' + item_type_id codeType,item_val codeDetail,item_desc codeContent1 + from las_codeitem where code_type <> '1' union SELECT '1' codeType,dep.id codeDetail,depname codeContent1 @@ -13,10 +13,9 @@ diff --git a/src/main/java/com/soft/line/mapper/AppletContractMapper.xml b/src/main/java/com/soft/line/mapper/AppletContractMapper.xml index 6b7f1a4..29af471 100644 --- a/src/main/java/com/soft/line/mapper/AppletContractMapper.xml +++ b/src/main/java/com/soft/line/mapper/AppletContractMapper.xml @@ -66,40 +66,41 @@ diff --git a/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml b/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml index 96b8792..a758bec 100644 --- a/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml +++ b/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml @@ -14,7 +14,7 @@ - + diff --git a/src/main/java/com/soft/line/service/impl/AppletCertificateServiceImpl.java b/src/main/java/com/soft/line/service/impl/AppletCertificateServiceImpl.java index 619ebf7..3cc91e9 100644 --- a/src/main/java/com/soft/line/service/impl/AppletCertificateServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/AppletCertificateServiceImpl.java @@ -131,7 +131,8 @@ public class AppletCertificateServiceImpl implements AppletCertificateService { List> mapList = appletCertificateMapper.getCertificateList(paramMap); //条件下的总个数 - int i = appletCertificateMapper.countCertificateList(paramMap); + //int i = appletCertificateMapper.countCertificateList(paramMap); + int i = mapList.size(); //总个数大于 map.put("hasMore", i > (num + ((int) paramMap.get("dataNum")))); diff --git a/src/main/java/com/soft/line/service/impl/AppletContractServiceImpl.java b/src/main/java/com/soft/line/service/impl/AppletContractServiceImpl.java index 6627609..1f70557 100644 --- a/src/main/java/com/soft/line/service/impl/AppletContractServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/AppletContractServiceImpl.java @@ -172,7 +172,8 @@ public class AppletContractServiceImpl implements AppletContractService { List> mapList = appletContractMapper.getContractQueryList(paraMap); //条件下的总个数 - int i = appletContractMapper.countContractQueryList(paraMap); + //int i = appletContractMapper.countContractQueryList(paraMap); + int i = mapList.size(); //总个数大于 当前数据+10 map.put("hasMore", i > (num + ((int) paraMap.get(AppletSystemConstant.DATA_NUM)))); diff --git a/src/main/java/com/soft/line/util/poi/PoiUtils.java b/src/main/java/com/soft/line/util/poi/PoiUtils.java index d14b1ec..b860977 100644 --- a/src/main/java/com/soft/line/util/poi/PoiUtils.java +++ b/src/main/java/com/soft/line/util/poi/PoiUtils.java @@ -254,9 +254,7 @@ public class PoiUtils { switch (k) { case 0: //证书编号 - if (cellValue == null || "".equals(cellValue)) { - warningMsg += "第" + j + "行证书编号为空 " ; - }else if(certificateInfoService.countByCId(null, cellValue) > 0){ + if (cellValue != null && !"".equals(cellValue) && certificateInfoService.countByCId(null, cellValue) > 0){ warningMsg += "第" + j + "行存在相同的证书编号 " ; } else { cert.setCertId(cellValue); @@ -275,6 +273,8 @@ public class PoiUtils { //证书名称 if (cellValue==null||"".equals(cellValue)){ warningMsg+="第"+j+"行证书名称不存在 "; + }else if (cellValue.length()>100){ + warningMsg+="第"+j+"行证书名称应不大于100字 "; }else{ cert.setCertName(cellValue); } @@ -289,7 +289,7 @@ public class PoiUtils { break; case 4: //发证日期 - if(!isDate(cellValue)){ + if(cellValue != null && !"".equals(cellValue) && !isDate(cellValue)){ warningMsg += "第" + j + "行发证日期格式错误!日期样式：【20100101】" ; }else{ cert.setBeginDate(StringToDate(cellValue)); @@ -297,7 +297,7 @@ public class PoiUtils { break; case 5: //到期日期 - if (!isDate(cellValue)) { + if (cellValue != null && !"".equals(cellValue) && !isDate(cellValue)) { warningMsg += "第" + j + "行到期日期格式错误!日期样式：【20100101】"; } else if (cert.getBeginDate() != null && cert.getEndDate() != null) { -- Gitee From d772c21f00203f50de43eb9633c82ce1625ef415 Mon Sep 17 00:00:00 2001 From: ljc Date: Wed, 25 Nov 2020 16:47:16 +0800 Subject: [PATCH 171/211] =?UTF-8?q?=E5=90=88=E5=90=8C=E7=AD=BE=E7=BA=A6?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E8=8C=83=E5=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/soft/line/mapper/AppletContractMapper.xml | 8 ++++---- src/main/java/com/soft/line/mapper/ContractInfoMapper.xml | 7 +++++-- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/soft/line/mapper/AppletContractMapper.xml b/src/main/java/com/soft/line/mapper/AppletContractMapper.xml index 29af471..bdecfd1 100644 --- a/src/main/java/com/soft/line/mapper/AppletContractMapper.xml +++ b/src/main/java/com/soft/line/mapper/AppletContractMapper.xml @@ -126,11 +126,11 @@ and sign_addr like concat('%',#{signAddr},'%') - - and SUBSTR(sign_time,1,10) >= #{beginSignTime} + + and SUBSTR(sign_time,1,10) >= #{signTimeBegin} - - and SUBSTR(sign_time,1,10) <= #{endSignTime} + + and SUBSTR(sign_time,1,10) <= #{signTimeEnd} and total_amount <= #{maxTotalAmount} diff --git a/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml b/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml index a758bec..96863ec 100644 --- a/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml +++ b/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml @@ -125,8 +125,11 @@ AND (instr(t1.part_a,#{partA,jdbcType=VARCHAR})>0 or instr(t1.part_b,#{partA,jdbcType=VARCHAR})>0 or instr(t1.part_c,#{partA,jdbcType=VARCHAR})>0) - - AND t1.sign_time >= #{signTime,jdbcType=TIMESTAMP} + + AND t1.sign_time =]]> #{signTimeBegin,jdbcType=TIMESTAMP} + + + AND t1.sign_time #{signTimeEnd,jdbcType=TIMESTAMP} AND instr(t1.sign_addr,#{signAddr,jdbcType=VARCHAR})>0 -- Gitee From 10f80f760167d866cd428f2bcb2bc3177f79be8a Mon Sep 17 00:00:00 2001 From: ljc Date: Thu, 26 Nov 2020 10:23:07 +0800 Subject: [PATCH 172/211] =?UTF-8?q?=E5=90=88=E5=90=8Cupdate=E8=AF=AD?= =?UTF-8?q?=E5=8F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/soft/line/mapper/ContractInfoMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml b/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml index 96863ec..5804c7f 100644 --- a/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml +++ b/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml @@ -80,7 +80,7 @@ `modify_person` = #{modifyPerson,jdbcType=VARCHAR}, `modify_time` = #{modifyTime,jdbcType=TIMESTAMP}, `contract_nature` = #{contractNature,jdbcType=VARCHAR}, - `contract_content` = #{contractContent,jdbcType=VARCHAR}, + `contract_content` = #{contractContent,jdbcType=VARCHAR} where `id` = #{id,jdbcType=INTEGER} -- Gitee From ce3ac56b966c0e742bdd1e0497396c8d550aec3b Mon Sep 17 00:00:00 2001 From: ljc Date: Thu, 26 Nov 2020 17:30:22 +0800 Subject: [PATCH 173/211] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=20=E5=90=88?= =?UTF-8?q?=E5=90=8C=E6=9B=B4=E6=96=B0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/soft/line/common/AppletSystemConstant.java | 2 +- .../com/soft/line/mapper/AppletCertificateMapper.xml | 4 ++-- .../java/com/soft/line/mapper/AppletCommonMapper.xml | 2 +- .../com/soft/line/mapper/AppletContractMapper.xml | 12 ++++++------ .../java/com/soft/line/mapper/LasUserInfoMapper.xml | 1 + 5 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/soft/line/common/AppletSystemConstant.java b/src/main/java/com/soft/line/common/AppletSystemConstant.java index 8b9d858..94978de 100644 --- a/src/main/java/com/soft/line/common/AppletSystemConstant.java +++ b/src/main/java/com/soft/line/common/AppletSystemConstant.java @@ -19,7 +19,7 @@ public class AppletSystemConstant { /** * 证书对应 code_type */ - public static final String CODE_TYPE_CERT = "3"; + public static final String CODE_TYPE_CERT = "103"; /* 合同 部分通用 */ diff --git a/src/main/java/com/soft/line/mapper/AppletCertificateMapper.xml b/src/main/java/com/soft/line/mapper/AppletCertificateMapper.xml index 266ea8c..1f565fb 100644 --- a/src/main/java/com/soft/line/mapper/AppletCertificateMapper.xml +++ b/src/main/java/com/soft/line/mapper/AppletCertificateMapper.xml @@ -104,7 +104,7 @@ update certificate_info set modify_person = #{modifyPerson}, modify_time = #{modifyTime}, - del_flg = #{delFlg} + del_flg = '1' where id = #{id} @@ -172,7 +172,7 @@ #{modifyPerson}, NOW(), - 0 + '0' ) diff --git a/src/main/java/com/soft/line/mapper/AppletCommonMapper.xml b/src/main/java/com/soft/line/mapper/AppletCommonMapper.xml index be47088..98f5c52 100644 --- a/src/main/java/com/soft/line/mapper/AppletCommonMapper.xml +++ b/src/main/java/com/soft/line/mapper/AppletCommonMapper.xml @@ -5,7 +5,7 @@ select - distinct t.id id,t.contract_name contractName, + t.id id,t.contract_name contractName,total_amount totalAmount,contract_nature contractNature from contract_info t where t.del_flg != 1 and t.pro_id in (select t1.pro_id from contract_info t1 where t1.del_flg != 1 @@ -152,13 +152,13 @@ `contract_nature`,`contract_content` ) values (#{depId,jdbcType=DECIMAL}, #{contractName,jdbcType=VARCHAR}, #{contractType,jdbcType=VARCHAR}, #{proId,jdbcType=VARCHAR}, - #{totalAmount,jdbcType=DECIMAL}, #{partA,jdbcType=VARCHAR}, #{partB,jdbcType=VARCHAR}, + #{totalAmount,jdbcType=DECIMAL}, #{partA,jdbcType=VARCHAR}, #{partB,jdbcType=VARCHAR},#{partC,jdbcType=VARCHAR}, #{signTime,jdbcType=TIMESTAMP}, #{signAddr,jdbcType=VARCHAR}, #{beginDate,jdbcType=TIMESTAMP}, #{endDate,jdbcType=TIMESTAMP}, #{payment,jdbcType=VARCHAR}, #{note,jdbcType=VARCHAR}, - #{modifyPerson,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}, #{delFlg,jdbcType=CHAR}, + #{modifyPerson,jdbcType=VARCHAR}, NOW(), '0', #{contractNature,jdbcType=VARCHAR}, #{contractContent,jdbcType=VARCHAR} ) @@ -183,9 +183,9 @@ note = #{note} , contract_nature = #{contractNature}, - contract_content #{contractContent}, + contract_content = #{contractContent}, modify_person = #{modifyPerson} , - modify_time = #{modifyTime} + modify_time = NOW() where id = #{id} @@ -205,7 +205,7 @@ - update contract_info set modify_person = #{modifyPerson} , del_flg = #{delFlg} , modify_time = #{modifyTime} where id = #{id} + update contract_info set modify_person = #{modifyPerson} , del_flg = '1' , modify_time = NOW() where id = #{id} \ No newline at end of file -- Gitee From 806cb31ec9c338741347ae6311b05a6c33d9f40b Mon Sep 17 00:00:00 2001 From: ljc <1119265069@qq.com> Date: Thu, 26 Nov 2020 23:17:41 +0800 Subject: [PATCH 174/211] =?UTF-8?q?=E5=90=88=E5=90=8C=E8=AF=81=E4=B9=A6?= =?UTF-8?q?=E8=B5=B7=E5=A7=8B=E6=97=A5=E6=9C=9F=E3=80=81=E7=BB=88=E6=AD=A2?= =?UTF-8?q?=E6=97=A5=E6=9C=9F=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/soft/line/mapper/AppletCertificateMapper.xml | 2 +- .../java/com/soft/line/mapper/AppletContractMapper.xml | 4 ++-- .../java/com/soft/line/mapper/CertificateInfoMapper.xml | 4 ++-- src/main/java/com/soft/line/mapper/ContractInfoMapper.xml | 8 ++++---- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/soft/line/mapper/AppletCertificateMapper.xml b/src/main/java/com/soft/line/mapper/AppletCertificateMapper.xml index 1f565fb..0e4b102 100644 --- a/src/main/java/com/soft/line/mapper/AppletCertificateMapper.xml +++ b/src/main/java/com/soft/line/mapper/AppletCertificateMapper.xml @@ -34,7 +34,7 @@ del_flg != 1 AND cert_type = #{certType} ORDER BY - begin_date DESC ,id + issue_date DESC ,id LIMIT #{pageNum},#{dataNum} diff --git a/src/main/java/com/soft/line/mapper/AppletContractMapper.xml b/src/main/java/com/soft/line/mapper/AppletContractMapper.xml index fbbaa36..126db97 100644 --- a/src/main/java/com/soft/line/mapper/AppletContractMapper.xml +++ b/src/main/java/com/soft/line/mapper/AppletContractMapper.xml @@ -88,10 +88,10 @@ and t1.sign_addr like concat('%',#{signAddr},'%') - and SUBSTR(t1.sign_time,1,10) >= #{beginSignTime} + and SUBSTR(t1.sign_time,1,10) <= #{beginSignTime} - and SUBSTR(t1.sign_time,1,10) <= #{endSignTime} + and SUBSTR(t1.sign_time,1,10) >= #{endSignTime} and t1.total_amount <= #{maxTotalAmount} diff --git a/src/main/java/com/soft/line/mapper/CertificateInfoMapper.xml b/src/main/java/com/soft/line/mapper/CertificateInfoMapper.xml index d2a5074..434f003 100644 --- a/src/main/java/com/soft/line/mapper/CertificateInfoMapper.xml +++ b/src/main/java/com/soft/line/mapper/CertificateInfoMapper.xml @@ -83,10 +83,10 @@ and instr(`cert_unit`,#{certUnit,jdbcType=VARCHAR})>0 - and `begin_date` =]]> #{beginDate} + and `begin_date` #{beginDate} - and `end_date` #{endDate} + and `end_date` =]]> #{endDate} order by `begin_date` desc,`modify_time` desc diff --git a/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml b/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml index 5804c7f..4d2d91b 100644 --- a/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml +++ b/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml @@ -135,14 +135,14 @@ AND instr(t1.sign_addr,#{signAddr,jdbcType=VARCHAR})>0 - AND t1.begin_date =]]> #{beginDate,jdbcType=TIMESTAMP} + AND t1.begin_date #{beginDate,jdbcType=TIMESTAMP} - AND t1.end_date #{endDate,jdbcType=TIMESTAMP} + AND t1.end_date =]]> #{endDate,jdbcType=TIMESTAMP} - + AND instr(t1.contract_nature,#{contractNature,jdbcType=VARCHAR})>0 -- Gitee From e6ddbd4954e7c35e3a34232ad5294d8c4e6565ec Mon Sep 17 00:00:00 2001 From: ljc Date: Fri, 27 Nov 2020 14:51:48 +0800 Subject: [PATCH 175/211] =?UTF-8?q?=E5=90=88=E5=90=8C=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../line/controller/StatisticsController.java | 30 +++++-- .../soft/line/filter/ConfigurationFilter.java | 4 +- .../soft/line/mapper/ContractInfoMapper.java | 19 ++--- .../soft/line/mapper/ContractInfoMapper.xml | 82 ++++++++++++++++-- .../soft/line/service/StatisticsService.java | 10 ++- .../service/impl/CodeDetailServiceImpl.java | 2 +- .../service/impl/StatisticsServiceImpl.java | 84 ++++++++++++++----- 7 files changed, 182 insertions(+), 49 deletions(-) diff --git a/src/main/java/com/soft/line/controller/StatisticsController.java b/src/main/java/com/soft/line/controller/StatisticsController.java index 42b4b18..b880b3b 100644 --- a/src/main/java/com/soft/line/controller/StatisticsController.java +++ b/src/main/java/com/soft/line/controller/StatisticsController.java @@ -22,12 +22,6 @@ public class StatisticsController { @Autowired private StatisticsService statisticsService; - @ApiOperation(value = "统计合同", notes = "统计合同") - @PostMapping("/contracts") - public CommonResult statisticsForContract(@RequestBody Map map){ - return CommonResult.success(statisticsService.statisticsForContract(map)); - } - @ApiOperation(value = "统计证书", notes = "统计证书") @PostMapping("/certificates") public CommonResult statisticsForCertificate(@RequestBody Map map){ @@ -71,4 +65,28 @@ public class StatisticsController { public CommonResult certTypeRankThisYear(){ return CommonResult.success(statisticsService.certTypeRankThisYear()); } + + @ApiOperation(value = "根据年份来统计合同数量", notes = "根据年份来统计合同数量") + @PostMapping("/contracts/sumContractByYear") + public CommonResult sumContractByYear(@RequestBody Map map){ + return CommonResult.success(statisticsService.sumContractByYear(map)); + } + + @ApiOperation(value = "根据年份来统计合同性质", notes = "根据年份来统计合同性质") + @PostMapping("/contracts/sumContractNatureByYear") + public CommonResult sumContractNatureByYear(@RequestBody Map map){ + return CommonResult.success(statisticsService.sumContractNatureByYear(map)); + } + + @ApiOperation(value = "根据部门年份来统计合同性质", notes = "根据部门年份来统计合同性质") + @PostMapping("/contracts/sumContractNatureByYearAndDep") + public CommonResult sumContractNatureByYearAndDep(@RequestBody Map map){ + return CommonResult.success(statisticsService.sumContractNatureByYearAndDep(map)); + } + + @ApiOperation(value = "根据部门统计合同个数", notes = "根据部门统计合同个数") + @PostMapping("/contracts/countNumGroupByYear") + public CommonResult countNumGroupByDep(){ + return CommonResult.success(statisticsService.countNumGroupByDep()); + } } diff --git a/src/main/java/com/soft/line/filter/ConfigurationFilter.java b/src/main/java/com/soft/line/filter/ConfigurationFilter.java index 25234e4..02d06ab 100644 --- a/src/main/java/com/soft/line/filter/ConfigurationFilter.java +++ b/src/main/java/com/soft/line/filter/ConfigurationFilter.java @@ -66,8 +66,8 @@ public class ConfigurationFilter { final String uri = request.getRequestURI(); String auth = request.getHeader("Access-Token"); Token token = null; - //if (!uri.contains("/")) { - if (!uri.contains("/login")&&!uri.contains("/autoLogin") && !uri.contains("/bindUserInfo") && !uri.contains("/uploadContractAttach") && !uri.contains("/uploadCertificateAttach") && !uri.contains("/uploadFiles") ) { + if (!uri.contains("/")) { + //if (!uri.contains("/login")&&!uri.contains("/autoLogin") && !uri.contains("/bindUserInfo") && !uri.contains("/uploadContractAttach") && !uri.contains("/uploadCertificateAttach") && !uri.contains("/uploadFiles") ) { if (auth == null || "".equals(auth)) { if (uri.contains("/file/download/")) { auth = request.getParameter("token"); diff --git a/src/main/java/com/soft/line/mapper/ContractInfoMapper.java b/src/main/java/com/soft/line/mapper/ContractInfoMapper.java index e9d799c..44596ac 100644 --- a/src/main/java/com/soft/line/mapper/ContractInfoMapper.java +++ b/src/main/java/com/soft/line/mapper/ContractInfoMapper.java @@ -27,21 +27,12 @@ public interface ContractInfoMapper { List getAllByIdList(@Param("idList")List idList); - //根据年份分组查询数量 - List> countNumGroupByYear(); - //根据部门分组查询数量 - List> countNumGroupByDep(); + List> countNumGroupByDep(@Param("depIdList")List depIdList); //根据部门分组查询数量(今年) List> countNumGroupByDepThisYear(); - //根据年份分组查询总金额 - List> countAmountGroupByYear(); - - //根据部门分组查询总金额 - List> countAmountGroupByDep(); - //根据部门分组查询历年数量 List> countDepGroupByYear(@Param("dep")String dep); @@ -57,4 +48,12 @@ public interface ContractInfoMapper { //部门合同排行榜 List> depRanking(); + //某年合同总数 + List> sumContractByYear(@Param("year") String year); + + //某年合同性质（收入，支出，净收益（收入-支出）） + List> sumContractNatureByYear(@Param("year") String year); + + //某年合同性质（收入，支出，净收益（收入-支出）） + List> sumContractNatureByYearAndDep(@Param("year") String year,@Param("depIdList")List depIdList); } \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml b/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml index 4d2d91b..1189615 100644 --- a/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml +++ b/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml @@ -7,7 +7,7 @@ This element is automatically generated by MyBatis Generator, do not modify. --> - + @@ -97,7 +97,8 @@ @@ -245,7 +255,7 @@ + + + + \ No newline at end of file diff --git a/src/main/java/com/soft/line/service/StatisticsService.java b/src/main/java/com/soft/line/service/StatisticsService.java index 1bdf9da..a6ab173 100644 --- a/src/main/java/com/soft/line/service/StatisticsService.java +++ b/src/main/java/com/soft/line/service/StatisticsService.java @@ -5,8 +5,6 @@ import java.util.Map; public interface StatisticsService { - public List> statisticsForContract(Map map); - public List> statisticsForCertificate(Map map); public List> countNumGroupByDepThisYear(Map map); @@ -20,4 +18,12 @@ public interface StatisticsService { public List> depRankingForContract(); public List> certTypeRankThisYear(); + + public List> sumContractByYear(Map map) ; + + public List> sumContractNatureByYear(Map map) ; + + public List> sumContractNatureByYearAndDep(Map map) ; + + public List> countNumGroupByDep() ; } diff --git a/src/main/java/com/soft/line/service/impl/CodeDetailServiceImpl.java b/src/main/java/com/soft/line/service/impl/CodeDetailServiceImpl.java index a56288c..07ed715 100644 --- a/src/main/java/com/soft/line/service/impl/CodeDetailServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/CodeDetailServiceImpl.java @@ -64,7 +64,7 @@ public class CodeDetailServiceImpl implements CodeDetailService { List depList = new ArrayList(); UserTokenDto userToken= HttpRequestUtil.getUserToken(); if(userToken!=null){ - String roleName = roleInfoMapper.selectByPrimaryKey(userToken.getUserInfo().getRoleId()).getName(); + String roleName = userToken.getUserInfo().getRoleName(); if (roleName.contains("管理员")){ depList = lasDepartmentInfoMapper.selectAllSuperior(); }else { diff --git a/src/main/java/com/soft/line/service/impl/StatisticsServiceImpl.java b/src/main/java/com/soft/line/service/impl/StatisticsServiceImpl.java index c4584b2..0c332d2 100644 --- a/src/main/java/com/soft/line/service/impl/StatisticsServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/StatisticsServiceImpl.java @@ -1,7 +1,11 @@ package com.soft.line.service.impl; +import com.soft.line.entity.LasDepartmentInfo; +import com.soft.line.filter.HttpRequestUtil; +import com.soft.line.filter.UserTokenDto; import com.soft.line.mapper.CertificateInfoMapper; import com.soft.line.mapper.ContractInfoMapper; +import com.soft.line.mapper.LasDepartmentInfoMapper; import com.soft.line.service.StatisticsService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -19,27 +23,8 @@ public class StatisticsServiceImpl implements StatisticsService { private ContractInfoMapper contractInfoMapper; @Autowired private CertificateInfoMapper certificateInfoMapper; - - @Override - public List> statisticsForContract(Map map) { - String x = (String)map.get("x"); - String y = (String)map.get("y"); - List> resultList = new ArrayList>(); - if (y.equals("数量")){ - if(x.equals("年份")){ - resultList = contractInfoMapper.countNumGroupByYear(); - }else if (x.equals("部门")){ - resultList = contractInfoMapper.countNumGroupByDep(); - } - }else if(y.equals("金额")){ - if(x.equals("年份")){ - resultList = contractInfoMapper.countAmountGroupByYear(); - }else if (x.equals("部门")){ - resultList = contractInfoMapper.countAmountGroupByDep(); - } - } - return resultList; - } + @Autowired + private LasDepartmentInfoMapper lasDepartmentInfoMapper; @Override public List> statisticsForCertificate(Map map) { @@ -88,5 +73,62 @@ public class StatisticsServiceImpl implements StatisticsService { return certificateInfoMapper.certTypeRankThisYear(); } + @Override + public List> sumContractByYear(Map map) { + return contractInfoMapper.sumContractByYear(map.get("year").toString()); + } + + @Override + public List> sumContractNatureByYear(Map map) { + return contractInfoMapper.sumContractNatureByYear(map.get("year").toString()); + } + + @Override + public List> sumContractNatureByYearAndDep(Map map) { + List depIdList = new ArrayList(); + UserTokenDto userToken= HttpRequestUtil.getUserToken(); + if (userToken!=null){ + String roleName = userToken.getUserInfo().getRoleName(); + if (roleName.equals("管理员")){ + return contractInfoMapper.sumContractNatureByYearAndDep(map.get("year").toString(),depIdList); + }else if (roleName.equals("部门经理")){ + LasDepartmentInfo departmentInfo = lasDepartmentInfoMapper.getDepByRole(userToken.getUserInfo().getId()); + List deps = lasDepartmentInfoMapper.selectSuperiorDepByDepId(departmentInfo.getId()); + for (LasDepartmentInfo dep:deps){ + depIdList.add(dep.getId()); + } + return contractInfoMapper.sumContractNatureByYearAndDep(map.get("year").toString(),depIdList); + }else{ + return null; + } + }else{ + return null; + } + + } + + @Override + public List> countNumGroupByDep() { + List depIdList = new ArrayList(); + UserTokenDto userToken= HttpRequestUtil.getUserToken(); + if (userToken!=null){ + String roleName = userToken.getUserInfo().getRoleName(); + if (roleName.equals("管理员")){ + return contractInfoMapper.countNumGroupByDep(depIdList); + }else if (roleName.equals("部门经理")){ + LasDepartmentInfo departmentInfo = lasDepartmentInfoMapper.getDepByRole(userToken.getUserInfo().getId()); + List deps = lasDepartmentInfoMapper.selectSuperiorDepByDepId(departmentInfo.getId()); + for (LasDepartmentInfo dep:deps){ + depIdList.add(dep.getId()); + } + return contractInfoMapper.countNumGroupByDep(depIdList); + }else{ + return null; + } + }else{ + return null; + } + } + } -- Gitee From 7be8a95306a0c766c947fe35e0aeb15e2cacbbf5 Mon Sep 17 00:00:00 2001 From: ljc Date: Fri, 27 Nov 2020 15:25:56 +0800 Subject: [PATCH 176/211] =?UTF-8?q?=E7=99=BB=E5=85=A5userInfo=E4=B8=AD?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=83=A8=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/soft/line/entity/UserPermission.java | 2 ++ .../soft/line/mapper/ContractInfoMapper.xml | 21 +------------------ .../line/service/impl/LoginServiceImpl.java | 5 +++++ 3 files changed, 8 insertions(+), 20 deletions(-) diff --git a/src/main/java/com/soft/line/entity/UserPermission.java b/src/main/java/com/soft/line/entity/UserPermission.java index 2f638fb..9e01bd8 100644 --- a/src/main/java/com/soft/line/entity/UserPermission.java +++ b/src/main/java/com/soft/line/entity/UserPermission.java @@ -29,5 +29,7 @@ public class UserPermission { private RoleInfo role; + private LasDepartmentInfo depInfo; + private List> menuList; } diff --git a/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml b/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml index 1189615..3f61186 100644 --- a/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml +++ b/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml @@ -7,7 +7,7 @@ This element is automatically generated by MyBatis Generator, do not modify. --> - + @@ -196,12 +196,6 @@ - - - - - - + + + - - + \ No newline at end of file diff --git a/src/main/java/com/soft/line/service/ContractInfoService.java b/src/main/java/com/soft/line/service/ContractInfoService.java index 7acc362..a2783e1 100644 --- a/src/main/java/com/soft/line/service/ContractInfoService.java +++ b/src/main/java/com/soft/line/service/ContractInfoService.java @@ -28,5 +28,5 @@ public interface ContractInfoService { public int countContractByIdAndName(Integer id,String contractName); - public List getAllByIDList(Map map) ; + public List getAllCNByIDList(Map map) ; } diff --git a/src/main/java/com/soft/line/service/impl/ContractInfoServiceImpl.java b/src/main/java/com/soft/line/service/impl/ContractInfoServiceImpl.java index 6003567..f412c50 100644 --- a/src/main/java/com/soft/line/service/impl/ContractInfoServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/ContractInfoServiceImpl.java @@ -8,10 +8,12 @@ import com.soft.line.mapper.AttachmentInfoMapper; import com.soft.line.mapper.ContractInfoMapper; import com.soft.line.service.ContractInfoService; import com.soft.line.util.pagehelper.PageUtil; +import io.swagger.models.auth.In; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Map; @@ -32,18 +34,30 @@ public class ContractInfoServiceImpl implements ContractInfoService{ @Override public PageInfo getAllAboutContracts(Map map) { PageUtil.setPageParam(map); - List certificateInfos=contractInfoMapper.getAllAboutContracts(map); - PageInfo beans = new PageInfo(certificateInfos); - beans.setList(certificateInfos); + List contractInfos=contractInfoMapper.getAllAboutContracts(map); + PageInfo beans = new PageInfo(contractInfos); + beans.setList(contractInfos); return beans; } @Override public PageInfo getAllContracts(Map map) { PageUtil.setPageParam(map); - List constracts=contractInfoMapper.selectAll(map); - PageInfo beans = new PageInfo(constracts); - beans.setList(constracts); + List conResults = new ArrayList(); + //根据查询条件查询数据 + List constracts1=contractInfoMapper.selectAll(map); + List idList = new ArrayList(); + for (ContractInfo con : constracts1){ + idList.add(con.getId()); + } + //查到的id在关联pro_id查询对应的收入支出合同 + List constracts2=contractInfoMapper.selectAllNaturesByIdList(idList); + for (ContractInfo con : constracts2){ + idList.add(con.getId()); + } + conResults = contractInfoMapper.getAllByIdList(idList); + PageInfo beans = new PageInfo(conResults); + beans.setList(conResults); return beans; } @@ -96,7 +110,7 @@ public class ContractInfoServiceImpl implements ContractInfoService{ } @Override - public List getAllByIDList(Map map) { - return contractInfoMapper.getAllByIdList((List)map.get("ids")); + public List getAllCNByIDList(Map map) { + return contractInfoMapper.getAllCNByIdList((List)map.get("ids")); } } -- Gitee From 02d7aa94c0e8c9d2e8a7551d5c1dacab26519119 Mon Sep 17 00:00:00 2001 From: ljc Date: Fri, 27 Nov 2020 17:14:32 +0800 Subject: [PATCH 178/211] =?UTF-8?q?=E5=90=88=E5=90=8C=E5=B0=8F=E7=A8=8B?= =?UTF-8?q?=E5=BA=8F=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../line/mapper/AppletContractMapper.java | 9 +- .../soft/line/mapper/AppletContractMapper.xml | 85 +++++++++++++++++-- .../impl/AppletContractServiceImpl.java | 27 +++++- 3 files changed, 112 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/soft/line/mapper/AppletContractMapper.java b/src/main/java/com/soft/line/mapper/AppletContractMapper.java index 9574361..1e92533 100644 --- a/src/main/java/com/soft/line/mapper/AppletContractMapper.java +++ b/src/main/java/com/soft/line/mapper/AppletContractMapper.java @@ -128,5 +128,12 @@ public interface AppletContractMapper { */ int checkContractByNameAndId(@Param(value = "contractName") String contractName, @Param(value = "id") int id); - + /** + * 通过proId 查询相关的支出合同 + */ + List> getAboutAllZCContracts(Map paraMap); + /** + * 查询相关的协议 + */ + List> getAboutAllXYContracts(Map paraMap); } diff --git a/src/main/java/com/soft/line/mapper/AppletContractMapper.xml b/src/main/java/com/soft/line/mapper/AppletContractMapper.xml index 126db97..309c728 100644 --- a/src/main/java/com/soft/line/mapper/AppletContractMapper.xml +++ b/src/main/java/com/soft/line/mapper/AppletContractMapper.xml @@ -66,10 +66,10 @@ @@ -216,4 +215,78 @@ select count(contract_name) from contract_info where del_flg != 1 and contract_name = #{contractName} and id != #{id} + + + \ No newline at end of file diff --git a/src/main/java/com/soft/line/service/impl/AppletContractServiceImpl.java b/src/main/java/com/soft/line/service/impl/AppletContractServiceImpl.java index 1f70557..e7f088f 100644 --- a/src/main/java/com/soft/line/service/impl/AppletContractServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/AppletContractServiceImpl.java @@ -18,6 +18,7 @@ import java.math.BigDecimal; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.*; +import java.util.stream.Collectors; /** * 小程序合同serviceImpl @@ -170,14 +171,36 @@ public class AppletContractServiceImpl implements AppletContractService { paraMap.put("pageNum", num); List> mapList = appletContractMapper.getContractQueryList(paraMap); + List> lists=new ArrayList<>(); + //添加所有的收入支出合同 + if(!mapList.isEmpty()){ + for(Map map1:mapList){ + lists.add(map1); + if(map1.get("proId")!=null && !map1.get("proId").toString().equals("")){ + paraMap.put("proId",map1.get("proId").toString()); + List> list=appletContractMapper.getAboutAllZCContracts(paraMap); + for(Map zcMap:list){ + lists.add(zcMap); + } + } + } + } + // 添加 所有的协议 + List> xylists=appletContractMapper.getAboutAllXYContracts(paraMap); + if (! xylists.isEmpty()) { + for (Map xyMap : xylists) { + lists.add(xyMap); + } + } //条件下的总个数 //int i = appletContractMapper.countContractQueryList(paraMap); - int i = mapList.size(); + // List> all=lists.stream().distinct().collect(Collectors.toList()); + int i = lists.size(); //总个数大于 当前数据+10 map.put("hasMore", i > (num + ((int) paraMap.get(AppletSystemConstant.DATA_NUM)))); - map.put("contractList", mapList); + map.put("contractList", lists); return AjaxResult.success(map); } -- Gitee From 938fca81bae33e102443492bbc39e677c0f4bfcd Mon Sep 17 00:00:00 2001 From: ljc Date: Fri, 27 Nov 2020 17:48:45 +0800 Subject: [PATCH 179/211] =?UTF-8?q?=E5=90=88=E5=90=8C=E5=B0=8F=E7=A8=8B?= =?UTF-8?q?=E5=BA=8F=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 4 +- .../line/mapper/AppletContractMapper.java | 10 +++++ .../soft/line/mapper/AppletContractMapper.xml | 41 ++++++++++++++++++- .../impl/AppletContractServiceImpl.java | 15 ++++++- 4 files changed, 65 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index b93ca90..8306d36 100644 --- a/pom.xml +++ b/pom.xml @@ -284,7 +284,7 @@ org.springframework.boot spring-boot-maven-plugin - + diff --git a/src/main/java/com/soft/line/mapper/AppletContractMapper.java b/src/main/java/com/soft/line/mapper/AppletContractMapper.java index 1e92533..7a9d8a4 100644 --- a/src/main/java/com/soft/line/mapper/AppletContractMapper.java +++ b/src/main/java/com/soft/line/mapper/AppletContractMapper.java @@ -136,4 +136,14 @@ public interface AppletContractMapper { * 查询相关的协议 */ List> getAboutAllXYContracts(Map paraMap); + + /** + * 通过id查询相关合同性质 + */ + List> getAboutContractNatureByIdList(@Param("idList")List idList); + + /** + * 通过ID查询相关合同 + */ + List> getAboutAllContractsByIdList(@Param("idList")List idList); } diff --git a/src/main/java/com/soft/line/mapper/AppletContractMapper.xml b/src/main/java/com/soft/line/mapper/AppletContractMapper.xml index 309c728..23e619b 100644 --- a/src/main/java/com/soft/line/mapper/AppletContractMapper.xml +++ b/src/main/java/com/soft/line/mapper/AppletContractMapper.xml @@ -69,7 +69,7 @@ t1.id id,t1.contract_name contractName,total_amount totalAmount,contract_nature contractNature,part_a partA,pro_id proId from contract_info t1 where t1.del_flg != 1 - and t1.contract_nature=1 + /*and t1.contract_nature=1*/ and t1.dep_id = #{depId} @@ -99,6 +99,9 @@ and t1.total_amount >= #{minTotalAmount} + + and t1.contract_nature = #{contractNature} + order by t1.modify_time desc,t1.pro_id,t1.id limit #{pageNum}, #{dataNum} @@ -289,4 +292,40 @@ limit #{pageNum}, #{dataNum} + + + + \ No newline at end of file diff --git a/src/main/java/com/soft/line/service/impl/AppletContractServiceImpl.java b/src/main/java/com/soft/line/service/impl/AppletContractServiceImpl.java index e7f088f..547ba53 100644 --- a/src/main/java/com/soft/line/service/impl/AppletContractServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/AppletContractServiceImpl.java @@ -169,11 +169,11 @@ public class AppletContractServiceImpl implements AppletContractService { //从第几条开始 int num = ((int) paraMap.get("pageNum") - 1) * ((int) paraMap.get("dataNum")); paraMap.put("pageNum", num); - + List idList = new ArrayList(); List> mapList = appletContractMapper.getContractQueryList(paraMap); List> lists=new ArrayList<>(); //添加所有的收入支出合同 - if(!mapList.isEmpty()){ + /*if(!mapList.isEmpty()){ for(Map map1:mapList){ lists.add(map1); if(map1.get("proId")!=null && !map1.get("proId").toString().equals("")){ @@ -192,6 +192,17 @@ public class AppletContractServiceImpl implements AppletContractService { for (Map xyMap : xylists) { lists.add(xyMap); } + }*/ + for (Map mp:mapList){ + idList.add(mp.get("id").toString()); + } + mapList = appletContractMapper.getAboutContractNatureByIdList(idList); + for (Map mp:mapList){ + idList.add(mp.get("id").toString()); + } + mapList = appletContractMapper.getAboutAllContractsByIdList(idList); + for(Map zcMap:mapList){ + lists.add(zcMap); } //条件下的总个数 //int i = appletContractMapper.countContractQueryList(paraMap); -- Gitee From fefc2db65943a03089d0acc17fdefb094d4ee789 Mon Sep 17 00:00:00 2001 From: ljc <1119265069@qq.com> Date: Sat, 28 Nov 2020 19:50:46 +0800 Subject: [PATCH 180/211] =?UTF-8?q?=E5=90=88=E5=90=8C=E7=B5=B1=E8=A8=88?= =?UTF-8?q?=E9=83=A8=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../soft/line/mapper/ContractInfoMapper.xml | 38 ++++++++++++------- .../soft/line/mapper/LasCodeItemMapper.java | 2 +- .../java/com/soft/line/util/poi/PoiUtils.java | 15 ++++++-- 3 files changed, 37 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml b/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml index 3470449..d90f771 100644 --- a/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml +++ b/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml @@ -123,8 +123,8 @@ AND (instr(part_a,#{partA,jdbcType=VARCHAR})>0 - or instr(part_b,#{partA,jdbcType=VARCHAR})>0 - or instr(part_c,#{partA,jdbcType=VARCHAR})>0) + or instr(part_b,#{partA,jdbcType=VARCHAR})>0 + or instr(part_c,#{partA,jdbcType=VARCHAR})>0) AND sign_time =]]> #{signTimeBegin,jdbcType=TIMESTAMP} @@ -166,12 +166,12 @@ #{id} and pro_id in ( - select t2.pro_id from contract_info t2 - where t2.del_flg = '0' - and `id` in - - #{id} - + select t2.pro_id from contract_info t2 + where t2.del_flg = '0' + and `id` in + + #{id} + ) order by sign_time desc,pro_id,dep_id,modify_time desc @@ -323,11 +323,23 @@ years.date select - t1.id id,t1.contract_name contractName,total_amount totalAmount,contract_nature contractNature,part_a partA,pro_id proId + t1.id id,t1.contract_name contractName, + total_amount totalAmount, + contract_nature contractNature, + (CASE when t1.contract_nature = 2 then part_b ELSE part_a end) as partA, + pro_id proId from contract_info t1 where t1.del_flg != 1 @@ -324,7 +327,7 @@ #{id} - order by t1.modify_time desc,t1.pro_id,t1.id + order by t1.pro_id,contract_nature,t1.sign_time desc,t1.modify_time desc,t1.id limit #{pageNum}, #{dataNum} diff --git a/src/main/java/com/soft/line/service/impl/AppletContractServiceImpl.java b/src/main/java/com/soft/line/service/impl/AppletContractServiceImpl.java index 547ba53..0a4da99 100644 --- a/src/main/java/com/soft/line/service/impl/AppletContractServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/AppletContractServiceImpl.java @@ -167,8 +167,10 @@ public class AppletContractServiceImpl implements AppletContractService { public AjaxResult getContractQueryList(Map paraMap) { Map map = new HashMap<>(0); //从第几条开始 - int num = ((int) paraMap.get("pageNum") - 1) * ((int) paraMap.get("dataNum")); - paraMap.put("pageNum", num); + int dataNum = (int) paraMap.get("dataNum"); + int pageNum = ((int) paraMap.get("pageNum") - 1) * ((int) paraMap.get("dataNum")); + paraMap.remove("pageNum"); + paraMap.remove("dataNum"); List idList = new ArrayList(); List> mapList = appletContractMapper.getContractQueryList(paraMap); List> lists=new ArrayList<>(); @@ -196,11 +198,14 @@ public class AppletContractServiceImpl implements AppletContractService { for (Map mp:mapList){ idList.add(mp.get("id").toString()); } - mapList = appletContractMapper.getAboutContractNatureByIdList(idList); + mapList = appletContractMapper.getAboutContractNatureByIdList(paraMap,idList); for (Map mp:mapList){ idList.add(mp.get("id").toString()); } - mapList = appletContractMapper.getAboutAllContractsByIdList(idList); + paraMap.put("idList",idList); + paraMap.put("pageNum",pageNum); + paraMap.put("dataNum",dataNum); + mapList = appletContractMapper.getAboutAllContractsByIdList(paraMap); for(Map zcMap:mapList){ lists.add(zcMap); } @@ -210,7 +215,7 @@ public class AppletContractServiceImpl implements AppletContractService { int i = lists.size(); //总个数大于 当前数据+10 - map.put("hasMore", i > (num + ((int) paraMap.get(AppletSystemConstant.DATA_NUM)))); + map.put("hasMore", i > (pageNum + ((int) paraMap.get(AppletSystemConstant.DATA_NUM)))); map.put("contractList", lists); return AjaxResult.success(map); -- Gitee From c02a8e9c80e0fb377a23ff735955001408d724a8 Mon Sep 17 00:00:00 2001 From: ljc <1119265069@qq.com> Date: Sun, 29 Nov 2020 20:20:23 +0800 Subject: [PATCH 183/211] =?UTF-8?q?=E5=90=88=E5=90=8C=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=EF=BC=8C=E6=B2=A1=E6=9C=89=E7=9A=84=E9=83=A8=E9=97=A8=E7=94=A8?= =?UTF-8?q?=E5=85=B6=E4=BB=96=E6=9B=BF=E4=BB=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/soft/line/util/poi/PoiUtils.java | 191 +++++++++--------- 1 file changed, 96 insertions(+), 95 deletions(-) diff --git a/src/main/java/com/soft/line/util/poi/PoiUtils.java b/src/main/java/com/soft/line/util/poi/PoiUtils.java index 216d86a..3d32ccc 100644 --- a/src/main/java/com/soft/line/util/poi/PoiUtils.java +++ b/src/main/java/com/soft/line/util/poi/PoiUtils.java @@ -206,11 +206,11 @@ public class PoiUtils { } } - public static Map excel2Certificate(MultipartFile file,CodeDetailService codeDetailService,CertificateInfoService certificateInfoService) { + public static Map excel2Certificate(MultipartFile file, CodeDetailService codeDetailService, CertificateInfoService certificateInfoService) { List certificateInfoList = new ArrayList(); CertificateInfo cert = null; - Map map = new HashMap(); - String warningMsg=""; + Map map = new HashMap(); + String warningMsg = ""; String chgrow = "\r\n"; try { String fileName = file.getOriginalFilename(); @@ -250,7 +250,7 @@ public class PoiUtils { for (int k = 0; k < physicalNumberOfCells; k++) { Cell cell = row.getCell(k); String cellValue = null; - if (cell!=null){ + if (cell != null) { cell.setCellType(CellType.STRING); cellValue = cell.getStringCellValue(); } @@ -258,44 +258,44 @@ public class PoiUtils { switch (k) { case 0: //证书编号 - if (cellValue != null && !"".equals(cellValue) && certificateInfoService.countByCId(null, cellValue) > 0){ - warningMsg += "第" + j + "行存在相同的证书编号 " ; + if (cellValue != null && !"".equals(cellValue) && certificateInfoService.countByCId(null, cellValue) > 0) { + warningMsg += "第" + j + "行存在相同的证书编号 "; } else { cert.setCertId(cellValue); } break; case 1: //证书类型 - lasCodeItem = codeDetailService.selectByItemDesc("103",cellValue); - if (lasCodeItem==null){ - warningMsg+="第"+j+"行证书类型不存在 "; - }else{ + lasCodeItem = codeDetailService.selectByItemDesc("103", cellValue); + if (lasCodeItem == null) { + warningMsg += "第" + j + "行证书类型不存在 "; + } else { cert.setCertType(lasCodeItem.getItemVal()); } break; case 2: //证书名称 - if (cellValue==null||"".equals(cellValue)){ - warningMsg+="第"+j+"行证书名称不存在 "; - }else if (cellValue.length()>100){ - warningMsg+="第"+j+"行证书名称应不大于100字 "; - }else{ + if (cellValue == null || "".equals(cellValue)) { + warningMsg += "第" + j + "行证书名称不存在 "; + } else if (cellValue.length() > 100) { + warningMsg += "第" + j + "行证书名称应不大于100字 "; + } else { cert.setCertName(cellValue); } break; case 3: //颁发单位 if (cellValue == null || "".equals(cellValue)) { - warningMsg += "第" + j + "行发奖单位为空 " ; + warningMsg += "第" + j + "行发奖单位为空 "; } else { cert.setCertUnit(cellValue); } break; case 4: //发证日期 - if(cellValue != null && !"".equals(cellValue) && !isDate(cellValue)){ - warningMsg += "第" + j + "行发证日期格式错误!日期样式：【20100101】" ; - }else{ + if (cellValue != null && !"".equals(cellValue) && !isDate(cellValue)) { + warningMsg += "第" + j + "行发证日期格式错误!日期样式：【20100101】"; + } else { cert.setBeginDate(StringToDate(cellValue)); } break; @@ -303,12 +303,11 @@ public class PoiUtils { //到期日期 if (cellValue != null && !"".equals(cellValue) && !isDate(cellValue)) { warningMsg += "第" + j + "行到期日期格式错误!日期样式：【20100101】"; - } - else if (cert.getBeginDate() != null && cert.getEndDate() != null) { + } else if (cert.getBeginDate() != null && cert.getEndDate() != null) { if (cert.getBeginDate().after(cert.getEndDate())) { warningMsg += "第" + j + "行发证日期大于到期日期 "; } - }else { + } else { cert.setEndDate(StringToDate(cellValue)); } break; @@ -318,9 +317,9 @@ public class PoiUtils { break; case 7: //颁发日期 - if (cellValue!=null && !"".equals(cellValue) && !isDate(cellValue)) { + if (cellValue != null && !"".equals(cellValue) && !isDate(cellValue)) { warningMsg += "第" + j + "行颁发日期格式错误!日期样式：【20100101】"; - }else { + } else { cert.setIssueDate(StringToDate(cellValue)); } break; @@ -329,18 +328,18 @@ public class PoiUtils { certificateInfoList.add(cert); } } - map.put("warningMsg",warningMsg); - map.put("certificateInfoList",certificateInfoList); + map.put("warningMsg", warningMsg); + map.put("certificateInfoList", certificateInfoList); } catch (IOException e) { e.printStackTrace(); - }finally { + } finally { return map; } } - public static Map excel2ContractInfo(MultipartFile file,CodeDetailService codeDetailService,ContractInfoService contractInfoService) { - Map map = new HashMap(); - String warningMsg=""; + public static Map excel2ContractInfo(MultipartFile file, CodeDetailService codeDetailService, ContractInfoService contractInfoService) { + Map map = new HashMap(); + String warningMsg = ""; List contractInfoList = new ArrayList(); ContractInfo cont = null; try { @@ -380,9 +379,9 @@ public class PoiUtils { cont = new ContractInfo(); for (int k = 0; k < physicalNumberOfCells; k++) { Cell cell = row.getCell(k); - System.out.println("k:"+k); + System.out.println("k:" + k); String cellValue = null; - if (cell!=null){ + if (cell != null) { cell.setCellType(CellType.STRING); cellValue = cell.getStringCellValue(); } @@ -390,32 +389,35 @@ public class PoiUtils { switch (k) { case 0: //部门 - LasDepartmentInfo dp = codeDetailService.selectSuperiorDepByDepName(cellValue); - if (dp==null){ - warningMsg+="第"+j+"行部门不存在 "; - }else{ - cont.setDepId(dp.getId()); + if (cellValue == null || "".equals(cellValue)) { + warningMsg += "第" + j + "行部门名称为空 "; + } else { + LasDepartmentInfo dp = codeDetailService.selectSuperiorDepByDepName(cellValue); + if (dp == null) { + cont.setDepId(codeDetailService.selectSuperiorDepByDepName("其它").getId()); + } else { + cont.setDepId(dp.getId()); + } } break; case 1: //合同名称 - if(cellValue==null||"".equals(cellValue)){ - warningMsg+="第"+j+"行合同名称为空 "; - }else if(contractInfoService.countContractByIdAndName(null,cellValue)>0){ - warningMsg+="第"+j+"行存在相同的合同名称 "; - }else if(cellValue.length()>100){ - warningMsg+="第"+j+"行合同名称应不大于100字 "; - } - else{ + if (cellValue == null || "".equals(cellValue)) { + warningMsg += "第" + j + "行合同名称为空 "; + } else if (contractInfoService.countContractByIdAndName(null, cellValue) > 0) { + warningMsg += "第" + j + "行存在相同的合同名称 "; + } else if (cellValue.length() > 100) { + warningMsg += "第" + j + "行合同名称应不大于100字 "; + } else { cont.setContractName(cellValue); } break; case 2: //合同类别 - lasCodeItem = codeDetailService.selectByItemDesc("102",cellValue); - if (lasCodeItem==null){ - warningMsg+="第"+j+"行合同类别不存在 "; - }else{ + lasCodeItem = codeDetailService.selectByItemDesc("102", cellValue); + if (lasCodeItem == null) { + warningMsg += "第" + j + "行合同类别不存在 "; + } else { cont.setContractType(lasCodeItem.getItemVal()); } break; @@ -426,29 +428,29 @@ public class PoiUtils { case 4: //总金额 if (cellValue == null || "".equals(cellValue)) { - warningMsg += "第" + j + "行总金额为空 " ; - } else if(!isNumber(cellValue)){ - warningMsg += "第" + j + "行总金额不是数字 " ; - }else { + warningMsg += "第" + j + "行总金额为空 "; + } else if (!isNumber(cellValue)) { + warningMsg += "第" + j + "行总金额不是数字 "; + } else { cont.setTotalAmount(new BigDecimal(StringToDoubleUtil.convert(cellValue))); } break; case 5: //甲方 if (cellValue == null || "".equals(cellValue)) { - warningMsg += "第" + j + "行甲方为空 " ; - } else if(cellValue.length()>100){ - warningMsg+="第"+j+"行甲方名称应不大于100字 "; - }else { + warningMsg += "第" + j + "行甲方为空 "; + } else if (cellValue.length() > 100) { + warningMsg += "第" + j + "行甲方名称应不大于100字 "; + } else { cont.setPartA(cellValue); } break; case 6: //乙方 if (cellValue == null || "".equals(cellValue)) { - warningMsg += "第" + j + "行乙方为空 " ; - }else if(cellValue.length()>100){ - warningMsg+="第"+j+"行合乙方称应不大于100字 "; + warningMsg += "第" + j + "行乙方为空 "; + } else if (cellValue.length() > 100) { + warningMsg += "第" + j + "行合乙方称应不大于100字 "; } else { cont.setPartB(cellValue); } @@ -463,38 +465,38 @@ public class PoiUtils { break; case 8: //签约日期 - if(!isDate(cellValue)){ - warningMsg += "第" + j + "行签约日期格式错误!日期样式：【20100101】" ; - }else{ + if (!isDate(cellValue)) { + warningMsg += "第" + j + "行签约日期格式错误!日期样式：【20100101】"; + } else { cont.setSignTime(StringToDate(cellValue)); } break; case 9: //签约地点 if (cellValue == null || "".equals(cellValue)) { - warningMsg += "第" + j + "行签约地点为空" ; + warningMsg += "第" + j + "行签约地点为空"; } else { cont.setSignAddr(cellValue); } break; case 10: //起始日期 - if(!isDate(cellValue)){ - warningMsg += "第" + j + "行起始日期格式错误!日期样式：【20100101】" ; - }else{ + if (!isDate(cellValue)) { + warningMsg += "第" + j + "行起始日期格式错误!日期样式：【20100101】"; + } else { cont.setBeginDate(StringToDate(cellValue)); } break; case 11: //终止日期 - if(!isDate(cellValue)){ - warningMsg += "第" + j + "行终止日期格式错误!日期样式：【20100101】" ; - }else{ + if (!isDate(cellValue)) { + warningMsg += "第" + j + "行终止日期格式错误!日期样式：【20100101】"; + } else { cont.setEndDate(StringToDate(cellValue)); } - if (cont.getBeginDate()!=null&&cont.getEndDate()!=null){ - if(cont.getBeginDate().after(cont.getEndDate())){ - warningMsg += "第" + j + "行起始日期大于终止日期 " ; + if (cont.getBeginDate() != null && cont.getEndDate() != null) { + if (cont.getBeginDate().after(cont.getEndDate())) { + warningMsg += "第" + j + "行起始日期大于终止日期 "; } } break; @@ -502,10 +504,10 @@ public class PoiUtils { case 12: //付款方式 if (cellValue == null || "".equals(cellValue)) { - warningMsg += "第" + j + "行付款方式为空 " ; - } else if(cellValue.length()>500){ - warningMsg += "第" + j + "行付款方式应不大于500字 " ; - }else { + warningMsg += "第" + j + "行付款方式为空 "; + } else if (cellValue.length() > 500) { + warningMsg += "第" + j + "行付款方式应不大于500字 "; + } else { cont.setPayment(cellValue); } break; @@ -519,10 +521,10 @@ public class PoiUtils { break; case 14: //合同性质 - lasCodeItem = codeDetailService.selectByItemDesc("104",cellValue); - if (lasCodeItem==null){ - warningMsg+="第"+j+"行合同性质不存在 "; - }else{ + lasCodeItem = codeDetailService.selectByItemDesc("104", cellValue); + if (lasCodeItem == null) { + warningMsg += "第" + j + "行合同性质不存在 "; + } else { cont.setContractNature(lasCodeItem.getItemVal()); } break; @@ -539,12 +541,11 @@ public class PoiUtils { contractInfoList.add(cont); } } - map.put("warningMsg",warningMsg); - map.put("contractInfoList",contractInfoList); + map.put("warningMsg", warningMsg); + map.put("contractInfoList", contractInfoList); } catch (Exception e) { e.printStackTrace(); - } - finally { + } finally { return map; } } @@ -604,14 +605,14 @@ public class PoiUtils { } //判断是否日期。格式yyyymmdd，基本上把闰年和2月等的情况都考虑进去了 - public static boolean isDate(String date){ + public static boolean isDate(String date) { // String s = "^((((1[6-9]|[2-9]\\d)\\d{2})(0?[13578]|1[02])(0?[1-9]|[12]\\d|3[01]))|(((1[6-9]|[2-9]\\d)\\d{2})(0?[13456789]|1[012])(0?[1-9]|[12]\\d|30))|(((1[6-9]|[2-9]\\d)\\d{2})0?2(0?[1-9]|1\\d|2[0-8]))|(((1[6-9]|[2-9]\\d)(0[48]|[2468][048]|[13579][26])|((16|[2468][048]|[3579][26])00))0?229))$"; String s = "(([0-9]{3}[1-9]|[0-9]{2}[1-9][0-9]{1}|[0-9]{1}[1-9][0-9]{2}|[1-9][0-9]{3})(((0[13578]|1[02])(0[1-9]|[12][0-9]|3[01]))|((0[469]|11)(0[1-9]|[12][0-9]|30))|(02(0[1-9]|[1][0-9]|2[0-8]))))|((([0-9]{2})(0[48]|[2468][048]|[13579][26])|((0[48]|[2468][048]|[3579][26])00))0229)"; Pattern p = Pattern.compile(s); Matcher m = p.matcher(date); - if(m.matches()){ + if (m.matches()) { return true; - }else{ + } else { return false; } } @@ -621,13 +622,13 @@ public class PoiUtils { Date date = null; boolean flag = false; - DateFormat dateFormat =new SimpleDateFormat("yyyyMMdd"); - try { - date = dateFormat.parse(source); - flag = true; - } catch (ParseException e) { - // e.printStackTrace(); - } + DateFormat dateFormat = new SimpleDateFormat("yyyyMMdd"); + try { + date = dateFormat.parse(source); + flag = true; + } catch (ParseException e) { + // e.printStackTrace(); + } if (flag) { return date; -- Gitee From 11fd45ed019a2a03402f5c01df5db897ccd2f1f4 Mon Sep 17 00:00:00 2001 From: ljc <1119265069@qq.com> Date: Sun, 29 Nov 2020 22:29:57 +0800 Subject: [PATCH 184/211] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E5=8F=96=E6=B6=88=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/soft/line/mapper/ContractInfoMapper.java | 2 +- .../com/soft/line/service/impl/CodeDetailServiceImpl.java | 2 +- .../soft/line/service/impl/ContractInfoServiceImpl.java | 7 +++++-- .../com/soft/line/service/impl/StatisticsServiceImpl.java | 4 ++-- src/main/java/com/soft/line/util/poi/PoiUtils.java | 2 +- src/main/resources/application.properties | 2 +- 6 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/soft/line/mapper/ContractInfoMapper.java b/src/main/java/com/soft/line/mapper/ContractInfoMapper.java index 97d56a6..794146e 100644 --- a/src/main/java/com/soft/line/mapper/ContractInfoMapper.java +++ b/src/main/java/com/soft/line/mapper/ContractInfoMapper.java @@ -26,7 +26,7 @@ public interface ContractInfoMapper { int countContractByIdAndName(@Param("id")Integer id,@Param("contractName")String contractName); - List getAllByIdList(@Param("idList")List idList); + List getAllByIdList(Map map); List getAllCNByIdList(@Param("idList")List idList); diff --git a/src/main/java/com/soft/line/service/impl/CodeDetailServiceImpl.java b/src/main/java/com/soft/line/service/impl/CodeDetailServiceImpl.java index 07ed715..93b4435 100644 --- a/src/main/java/com/soft/line/service/impl/CodeDetailServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/CodeDetailServiceImpl.java @@ -65,7 +65,7 @@ public class CodeDetailServiceImpl implements CodeDetailService { UserTokenDto userToken= HttpRequestUtil.getUserToken(); if(userToken!=null){ String roleName = userToken.getUserInfo().getRoleName(); - if (roleName.contains("管理员")){ + if (roleName.contains("管理员")||roleName.contains("归档登记员")){ depList = lasDepartmentInfoMapper.selectAllSuperior(); }else { LasDepartmentInfo departmentInfo = lasDepartmentInfoMapper.getDepByRole(userToken.getUserInfo().getId()); diff --git a/src/main/java/com/soft/line/service/impl/ContractInfoServiceImpl.java b/src/main/java/com/soft/line/service/impl/ContractInfoServiceImpl.java index f412c50..ac5a57e 100644 --- a/src/main/java/com/soft/line/service/impl/ContractInfoServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/ContractInfoServiceImpl.java @@ -1,5 +1,6 @@ package com.soft.line.service.impl; +import com.github.pagehelper.Page; import com.github.pagehelper.PageInfo; import com.soft.line.entity.ContractInfo; import com.soft.line.filter.HttpRequestUtil; @@ -42,7 +43,7 @@ public class ContractInfoServiceImpl implements ContractInfoService{ @Override public PageInfo getAllContracts(Map map) { - PageUtil.setPageParam(map); + //PageUtil.setPageParam(map); List conResults = new ArrayList(); //根据查询条件查询数据 List constracts1=contractInfoMapper.selectAll(map); @@ -55,7 +56,9 @@ public class ContractInfoServiceImpl implements ContractInfoService{ for (ContractInfo con : constracts2){ idList.add(con.getId()); } - conResults = contractInfoMapper.getAllByIdList(idList); + map.put("idList",idList); + PageUtil.setPageParam(map); + conResults = contractInfoMapper.getAllByIdList(map); PageInfo beans = new PageInfo(conResults); beans.setList(conResults); return beans; diff --git a/src/main/java/com/soft/line/service/impl/StatisticsServiceImpl.java b/src/main/java/com/soft/line/service/impl/StatisticsServiceImpl.java index 0c332d2..7e4e21c 100644 --- a/src/main/java/com/soft/line/service/impl/StatisticsServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/StatisticsServiceImpl.java @@ -89,7 +89,7 @@ public class StatisticsServiceImpl implements StatisticsService { UserTokenDto userToken= HttpRequestUtil.getUserToken(); if (userToken!=null){ String roleName = userToken.getUserInfo().getRoleName(); - if (roleName.equals("管理员")){ + if (roleName.equals("管理员")||roleName.contains("归档登记员")){ return contractInfoMapper.sumContractNatureByYearAndDep(map.get("year").toString(),depIdList); }else if (roleName.equals("部门经理")){ LasDepartmentInfo departmentInfo = lasDepartmentInfoMapper.getDepByRole(userToken.getUserInfo().getId()); @@ -113,7 +113,7 @@ public class StatisticsServiceImpl implements StatisticsService { UserTokenDto userToken= HttpRequestUtil.getUserToken(); if (userToken!=null){ String roleName = userToken.getUserInfo().getRoleName(); - if (roleName.equals("管理员")){ + if (roleName.equals("管理员")||roleName.contains("归档登记员")){ return contractInfoMapper.countNumGroupByDep(depIdList); }else if (roleName.equals("部门经理")){ LasDepartmentInfo departmentInfo = lasDepartmentInfoMapper.getDepByRole(userToken.getUserInfo().getId()); diff --git a/src/main/java/com/soft/line/util/poi/PoiUtils.java b/src/main/java/com/soft/line/util/poi/PoiUtils.java index 3d32ccc..8fbf61e 100644 --- a/src/main/java/com/soft/line/util/poi/PoiUtils.java +++ b/src/main/java/com/soft/line/util/poi/PoiUtils.java @@ -533,7 +533,7 @@ public class PoiUtils { if (cellValue != null && !"".equals(cellValue) && cellValue.length() > 1000) { warningMsg += "第" + j + "行合同内容应不大于1000字 "; } else { - cont.setNote(cellValue); + cont.setContractContent(cellValue); } break; } diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index b7114ac..7904a76 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -40,7 +40,7 @@ logging.level.com.soft.line.mapper = debug pagehelper.helper-dialect=mysql pagehelper.params=count=countSql pagehelper.reasonable=true -pagehelper.support-methods-arguments=true +pagehelper.support-methods-arguments=false #mybatisӳļ· #mybatis.mapper-locations=com.soft.line.mapper/*.xml #ʵ· -- Gitee From 9301aa6ffec0e874529e5c0209bfcf444cd95e5a Mon Sep 17 00:00:00 2001 From: ljc Date: Mon, 30 Nov 2020 16:13:59 +0800 Subject: [PATCH 185/211] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../soft/line/mapper/AppletContractMapper.xml | 16 ++--- .../impl/AppletContractServiceImpl.java | 69 ++++++------------- .../service/impl/ContractInfoServiceImpl.java | 28 ++++---- 3 files changed, 45 insertions(+), 68 deletions(-) diff --git a/src/main/java/com/soft/line/mapper/AppletContractMapper.xml b/src/main/java/com/soft/line/mapper/AppletContractMapper.xml index 078ba7a..d9120c8 100644 --- a/src/main/java/com/soft/line/mapper/AppletContractMapper.xml +++ b/src/main/java/com/soft/line/mapper/AppletContractMapper.xml @@ -88,16 +88,16 @@ and t1.sign_addr like concat('%',#{signAddr},'%') - and SUBSTR(t1.sign_time,1,10) <= #{beginSignTime} + and SUBSTR(t1.sign_time,1,10) = ]]> #{beginSignTime} - and SUBSTR(t1.sign_time,1,10) >= #{endSignTime} + and SUBSTR(t1.sign_time,1,10) #{endSignTime} - and t1.total_amount <= #{maxTotalAmount} + and t1.total_amount #{maxTotalAmount} - and t1.total_amount >= #{minTotalAmount} + and t1.total_amount = ]]> #{minTotalAmount} and t1.contract_nature = #{contractNature} @@ -128,16 +128,16 @@ and sign_addr like concat('%',#{signAddr},'%') - and SUBSTR(sign_time,1,10) >= #{signTimeBegin} + and SUBSTR(sign_time,1,10) = ]]> #{signTimeBegin} - and SUBSTR(sign_time,1,10) <= #{signTimeEnd} + and SUBSTR(sign_time,1,10) #{signTimeEnd} - and total_amount <= #{maxTotalAmount} + and total_amount #{maxTotalAmount} - and total_amount >= #{minTotalAmount} + and total_amount = ]]> #{minTotalAmount} diff --git a/src/main/java/com/soft/line/service/impl/AppletContractServiceImpl.java b/src/main/java/com/soft/line/service/impl/AppletContractServiceImpl.java index 0a4da99..1ef3212 100644 --- a/src/main/java/com/soft/line/service/impl/AppletContractServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/AppletContractServiceImpl.java @@ -134,7 +134,7 @@ public class AppletContractServiceImpl implements AppletContractService { List> mapList = appletContractMapper.getContractList(paraMap); //条件下的总个数 - int i = appletContractMapper.countContractList(paraMap.get("depId").toString(),paraMap.get("signTime").toString()); + int i = appletContractMapper.countContractList(paraMap.get("depId").toString(), paraMap.get("signTime").toString()); //总个数大于 当前数据+10 map.put("hasMore", i > (num + ((int) paraMap.get(AppletSystemConstant.DATA_NUM)))); @@ -146,12 +146,12 @@ public class AppletContractServiceImpl implements AppletContractService { @Override public AjaxResult getContractSearchList(Map paraMap) { - Map map = new HashMap<>(0); + Map map = new HashMap<>(0); //从第几条开始 int num = ((int) paraMap.get("pageNum") - 1) * ((int) paraMap.get("dataNum")); paraMap.put("pageNum", num); - List> mapList = appletContractMapper.getContractSearchList(paraMap); + List> mapList = appletContractMapper.getContractSearchList(paraMap); //条件下的总个数 int i = appletContractMapper.countContractSearchList(paraMap.get("contractName").toString()); @@ -165,53 +165,26 @@ public class AppletContractServiceImpl implements AppletContractService { @Override public AjaxResult getContractQueryList(Map paraMap) { - Map map = new HashMap<>(0); + Map map = new HashMap<>(0); //从第几条开始 - int dataNum = (int) paraMap.get("dataNum"); int pageNum = ((int) paraMap.get("pageNum") - 1) * ((int) paraMap.get("dataNum")); - paraMap.remove("pageNum"); - paraMap.remove("dataNum"); + paraMap.put("pageNum", pageNum); List idList = new ArrayList(); - List> mapList = appletContractMapper.getContractQueryList(paraMap); - List> lists=new ArrayList<>(); - //添加所有的收入支出合同 - /*if(!mapList.isEmpty()){ - for(Map map1:mapList){ - lists.add(map1); - if(map1.get("proId")!=null && !map1.get("proId").toString().equals("")){ - paraMap.put("proId",map1.get("proId").toString()); - List> list=appletContractMapper.getAboutAllZCContracts(paraMap); - for(Map zcMap:list){ - lists.add(zcMap); - } - } + List> lists = new ArrayList<>(); + List> mapList = appletContractMapper.getContractQueryList(paraMap); + if (mapList.size() > 0) { + for (Map mp : mapList) { + idList.add(mp.get("id").toString()); } - - } - // 添加 所有的协议 - List> xylists=appletContractMapper.getAboutAllXYContracts(paraMap); - if (! xylists.isEmpty()) { - for (Map xyMap : xylists) { - lists.add(xyMap); + mapList = appletContractMapper.getAboutContractNatureByIdList(paraMap, idList); + for (Map mp : mapList) { + idList.add(mp.get("id").toString()); } - }*/ - for (Map mp:mapList){ - idList.add(mp.get("id").toString()); - } - mapList = appletContractMapper.getAboutContractNatureByIdList(paraMap,idList); - for (Map mp:mapList){ - idList.add(mp.get("id").toString()); - } - paraMap.put("idList",idList); - paraMap.put("pageNum",pageNum); - paraMap.put("dataNum",dataNum); - mapList = appletContractMapper.getAboutAllContractsByIdList(paraMap); - for(Map zcMap:mapList){ - lists.add(zcMap); + paraMap.put("idList", idList); + mapList = appletContractMapper.getAboutAllContractsByIdList(paraMap); } + lists = mapList; //条件下的总个数 - //int i = appletContractMapper.countContractQueryList(paraMap); - // List> all=lists.stream().distinct().collect(Collectors.toList()); int i = lists.size(); //总个数大于 当前数据+10 @@ -273,7 +246,7 @@ public class AppletContractServiceImpl implements AppletContractService { if (!deleteResult) { //deleteErrorMsg += "，删除文件：" + attachmentUrl.substring(attachmentUrl.lastIndexOf("/")) + "失败"; - deleteErrorMsg.append("，删除文件：").append(attachmentUrl.substring(attachmentUrl.lastIndexOf("/")+1)).append("失败"); + deleteErrorMsg.append("，删除文件：").append(attachmentUrl.substring(attachmentUrl.lastIndexOf("/") + 1)).append("失败"); } else { appletCommonMapper.delAnnex(attachmentInfo.getId()); } @@ -293,12 +266,12 @@ public class AppletContractServiceImpl implements AppletContractService { } //如果值为null 转化为"" - for (String key: map.keySet()) { - if (map.get(key)==null){ - map.put(key,""); + for (String key : map.keySet()) { + if (map.get(key) == null) { + map.put(key, ""); } } - map.put("totalAmount",((BigDecimal)map.get("totalAmount")).stripTrailingZeros().toPlainString()); + map.put("totalAmount", ((BigDecimal) map.get("totalAmount")).stripTrailingZeros().toPlainString()); //附件详情 int cId = (int) paraMap.get("id"); diff --git a/src/main/java/com/soft/line/service/impl/ContractInfoServiceImpl.java b/src/main/java/com/soft/line/service/impl/ContractInfoServiceImpl.java index ac5a57e..6b9b043 100644 --- a/src/main/java/com/soft/line/service/impl/ContractInfoServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/ContractInfoServiceImpl.java @@ -46,19 +46,23 @@ public class ContractInfoServiceImpl implements ContractInfoService{ //PageUtil.setPageParam(map); List conResults = new ArrayList(); //根据查询条件查询数据 - List constracts1=contractInfoMapper.selectAll(map); - List idList = new ArrayList(); - for (ContractInfo con : constracts1){ - idList.add(con.getId()); + List constracts1 = contractInfoMapper.selectAll(map); + if (constracts1.size() == 0) { + conResults = constracts1; + } else { + List idList = new ArrayList(); + for (ContractInfo con : constracts1) { + idList.add(con.getId()); + } + //查到的id在关联pro_id查询对应的收入支出合同 + List constracts2 = contractInfoMapper.selectAllNaturesByIdList(idList); + for (ContractInfo con : constracts2) { + idList.add(con.getId()); + } + map.put("idList", idList); + PageUtil.setPageParam(map); + conResults = contractInfoMapper.getAllByIdList(map); } - //查到的id在关联pro_id查询对应的收入支出合同 - List constracts2=contractInfoMapper.selectAllNaturesByIdList(idList); - for (ContractInfo con : constracts2){ - idList.add(con.getId()); - } - map.put("idList",idList); - PageUtil.setPageParam(map); - conResults = contractInfoMapper.getAllByIdList(map); PageInfo beans = new PageInfo(conResults); beans.setList(conResults); return beans; -- Gitee From 13d59eb69399c01d157099de6436d172db14efcb Mon Sep 17 00:00:00 2001 From: ljc Date: Mon, 30 Nov 2020 17:34:03 +0800 Subject: [PATCH 186/211] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E8=AF=81?= =?UTF-8?q?=E4=B9=A6=E6=B7=BB=E5=8A=A0=EF=BC=8C=E8=8E=B7=E5=8F=96=E4=B8=8A?= =?UTF-8?q?=E7=BA=A7=E9=83=A8=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../soft/line/controller/LoginController.java | 6 +++++ .../soft/line/entity/AppletCertificate.java | 4 +-- .../line/mapper/LasDepartmentInfoMapper.java | 3 +++ .../line/mapper/LasDepartmentInfoMapper.xml | 5 ++++ .../soft/line/service/CodeDetailService.java | 1 + .../com/soft/line/service/LoginService.java | 3 +++ .../service/impl/CodeDetailServiceImpl.java | 10 +++++++ .../line/service/impl/LoginServiceImpl.java | 27 ++++++++++--------- .../service/impl/StatisticsServiceImpl.java | 10 +++++++ 9 files changed, 55 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/soft/line/controller/LoginController.java b/src/main/java/com/soft/line/controller/LoginController.java index 303be06..0ced770 100644 --- a/src/main/java/com/soft/line/controller/LoginController.java +++ b/src/main/java/com/soft/line/controller/LoginController.java @@ -55,6 +55,12 @@ public class LoginController { public CommonResult getStr(){ return CommonResult.success("abc"); } + + @PostMapping("/getSupDep") + public CommonResult getSupDep(@RequestBody Map map){ + String depId= (String)map.get("depId"); + return CommonResult.success(loginService.getSupDep(depId)); + } } diff --git a/src/main/java/com/soft/line/entity/AppletCertificate.java b/src/main/java/com/soft/line/entity/AppletCertificate.java index 379bd81..e31989e 100644 --- a/src/main/java/com/soft/line/entity/AppletCertificate.java +++ b/src/main/java/com/soft/line/entity/AppletCertificate.java @@ -30,9 +30,9 @@ public class AppletCertificate { @Size(max = 100) private String certName; - @NotBlank + /*@NotBlank @Size(max = 200) - private String projectName; + private String projectName;*/ @NotBlank @Size(max = 200) diff --git a/src/main/java/com/soft/line/mapper/LasDepartmentInfoMapper.java b/src/main/java/com/soft/line/mapper/LasDepartmentInfoMapper.java index c49bf66..63961b0 100644 --- a/src/main/java/com/soft/line/mapper/LasDepartmentInfoMapper.java +++ b/src/main/java/com/soft/line/mapper/LasDepartmentInfoMapper.java @@ -14,4 +14,7 @@ public interface LasDepartmentInfoMapper { List selectSuperiorDepByDepId(@Param("depId") String depId); LasDepartmentInfo selectSuperiorDepByDepName(@Param("depName") String depName); + + //获取上一级部门 + LasDepartmentInfo selectSupDepByDepId(@Param("depId") String depId); } \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/LasDepartmentInfoMapper.xml b/src/main/java/com/soft/line/mapper/LasDepartmentInfoMapper.xml index adeb9f2..6963869 100644 --- a/src/main/java/com/soft/line/mapper/LasDepartmentInfoMapper.xml +++ b/src/main/java/com/soft/line/mapper/LasDepartmentInfoMapper.xml @@ -34,4 +34,9 @@ WHERE dep.depname = #{depName} and dep.superior_dep_id = 0 + + \ No newline at end of file diff --git a/src/main/java/com/soft/line/service/CodeDetailService.java b/src/main/java/com/soft/line/service/CodeDetailService.java index 661ae0c..e5716e3 100644 --- a/src/main/java/com/soft/line/service/CodeDetailService.java +++ b/src/main/java/com/soft/line/service/CodeDetailService.java @@ -19,4 +19,5 @@ public interface CodeDetailService { public List selectAllDep(); public LasDepartmentInfo selectSuperiorDepByDepName(String depName); + } diff --git a/src/main/java/com/soft/line/service/LoginService.java b/src/main/java/com/soft/line/service/LoginService.java index 02f1fff..2d8fc84 100644 --- a/src/main/java/com/soft/line/service/LoginService.java +++ b/src/main/java/com/soft/line/service/LoginService.java @@ -1,5 +1,6 @@ package com.soft.line.service; +import com.soft.line.entity.LasDepartmentInfo; import com.soft.line.entity.UserInfo; import com.soft.line.entity.UserPermission; import com.soft.line.util.MP.AjaxResult; @@ -29,4 +30,6 @@ public interface LoginService { AjaxResult untie(); UserPermission getUserPermission(); + + LasDepartmentInfo getSupDep(String depId); } diff --git a/src/main/java/com/soft/line/service/impl/CodeDetailServiceImpl.java b/src/main/java/com/soft/line/service/impl/CodeDetailServiceImpl.java index 93b4435..f9cef61 100644 --- a/src/main/java/com/soft/line/service/impl/CodeDetailServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/CodeDetailServiceImpl.java @@ -69,6 +69,7 @@ public class CodeDetailServiceImpl implements CodeDetailService { depList = lasDepartmentInfoMapper.selectAllSuperior(); }else { LasDepartmentInfo departmentInfo = lasDepartmentInfoMapper.getDepByRole(userToken.getUserInfo().getId()); + departmentInfo = getSupDep(departmentInfo.getId()); depList = lasDepartmentInfoMapper.selectSuperiorDepByDepId(departmentInfo.getId()); } } @@ -85,4 +86,13 @@ public class CodeDetailServiceImpl implements CodeDetailService { return lasDepartmentInfoMapper.selectSuperiorDepByDepName(depName); } + public LasDepartmentInfo getSupDep(String depId) { + LasDepartmentInfo lasDepartmentInfo = lasDepartmentInfoMapper.selectSupDepByDepId(depId); + while (lasDepartmentInfo!=null && !lasDepartmentInfo.getSuperiorDepId().equals("0")){ + lasDepartmentInfo = getSupDep(lasDepartmentInfo.getId()); + } + lasDepartmentInfo = lasDepartmentInfoMapper.selectSuperiorDepByDepId(depId).get(0); + return lasDepartmentInfo; + } + } diff --git a/src/main/java/com/soft/line/service/impl/LoginServiceImpl.java b/src/main/java/com/soft/line/service/impl/LoginServiceImpl.java index 7336230..3bc6904 100644 --- a/src/main/java/com/soft/line/service/impl/LoginServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/LoginServiceImpl.java @@ -268,27 +268,18 @@ public class LoginServiceImpl implements LoginService { public UserPermission getUserPermission() { UserTokenDto userTokenDto=HttpRequestUtil.getUserToken(); Integer userId = userTokenDto.getUserInfo().getId(); - /*UserInfo userInfo=userInfoMapper.selectByPrimaryKey(userId); - UserPermission userPermission=new UserPermission(); - userPermission.setId(userId); - userPermission.setPhone(userInfo.getPhone()); - //userPermission.setAvatar(userInfo.getHeadImgUrl()); - userPermission.setModifyTime(userInfo.getModifyTime()); - userPermission.setRoleId(userInfo.getRoleId()); - userPermission.setUserName(userInfo.getUserName()); - userPermission.setStatus(Integer.parseInt(userInfo.getUserStatus()));*/ LasUserInfo userInfo=lasUserInfoMapper.selectByPrimaryKey(userId); UserPermission userPermission=new UserPermission(); userPermission.setId(userId); userPermission.setPhone(userInfo.getTelephone()); - //userPermission.setAvatar(userInfo.getHeadImgUrl()); userPermission.setModifyTime(userInfo.getLastUpdateTime()); userPermission.setRoleId(userInfo.getRoleId()); userPermission.setUserName(userInfo.getUserName()); userPermission.setStatus(userInfo.getUserStatus()); //对应部门 - LasDepartmentInfo lasDepartmentInfo = lasDepartmentInfoMapper.selectSuperiorDepByDepId(userInfo.getDepId()).get(0); - userPermission.setDepInfo(lasDepartmentInfo); + LasDepartmentInfo lasDepartmentInfo = getSupDep(userInfo.getDepId()); + LasDepartmentInfo supDep = lasDepartmentInfoMapper.selectSuperiorDepByDepId(lasDepartmentInfo.getId()).get(0); + userPermission.setDepInfo(supDep); //获取对应角色 RoleInfo role = roleInfoMapper.selectByPrimaryKey(userInfo.getRoleId()); userPermission.setRole(role); @@ -316,4 +307,16 @@ public class LoginServiceImpl implements LoginService { userPermission.setMenuList(menuList); return userPermission; } + + @Override + public LasDepartmentInfo getSupDep(String depId) { + LasDepartmentInfo lasDepartmentInfo = lasDepartmentInfoMapper.selectSupDepByDepId(depId); + while (lasDepartmentInfo!=null && !lasDepartmentInfo.getSuperiorDepId().equals("0")){ + lasDepartmentInfo = getSupDep(lasDepartmentInfo.getId()); + } + lasDepartmentInfo = lasDepartmentInfoMapper.selectSuperiorDepByDepId(depId).get(0); + return lasDepartmentInfo; + } + + } diff --git a/src/main/java/com/soft/line/service/impl/StatisticsServiceImpl.java b/src/main/java/com/soft/line/service/impl/StatisticsServiceImpl.java index 7e4e21c..43b10f3 100644 --- a/src/main/java/com/soft/line/service/impl/StatisticsServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/StatisticsServiceImpl.java @@ -93,6 +93,7 @@ public class StatisticsServiceImpl implements StatisticsService { return contractInfoMapper.sumContractNatureByYearAndDep(map.get("year").toString(),depIdList); }else if (roleName.equals("部门经理")){ LasDepartmentInfo departmentInfo = lasDepartmentInfoMapper.getDepByRole(userToken.getUserInfo().getId()); + departmentInfo = getSupDep(departmentInfo.getId()); List deps = lasDepartmentInfoMapper.selectSuperiorDepByDepId(departmentInfo.getId()); for (LasDepartmentInfo dep:deps){ depIdList.add(dep.getId()); @@ -117,6 +118,7 @@ public class StatisticsServiceImpl implements StatisticsService { return contractInfoMapper.countNumGroupByDep(depIdList); }else if (roleName.equals("部门经理")){ LasDepartmentInfo departmentInfo = lasDepartmentInfoMapper.getDepByRole(userToken.getUserInfo().getId()); + departmentInfo = getSupDep(departmentInfo.getId()); List deps = lasDepartmentInfoMapper.selectSuperiorDepByDepId(departmentInfo.getId()); for (LasDepartmentInfo dep:deps){ depIdList.add(dep.getId()); @@ -130,5 +132,13 @@ public class StatisticsServiceImpl implements StatisticsService { } } + public LasDepartmentInfo getSupDep(String depId) { + LasDepartmentInfo lasDepartmentInfo = lasDepartmentInfoMapper.selectSupDepByDepId(depId); + while (lasDepartmentInfo!=null && !lasDepartmentInfo.getSuperiorDepId().equals("0")){ + lasDepartmentInfo = getSupDep(lasDepartmentInfo.getId()); + } + lasDepartmentInfo = lasDepartmentInfoMapper.selectSuperiorDepByDepId(depId).get(0); + return lasDepartmentInfo; + } } -- Gitee From 96fa6fa99ad19ebffa01b711d3f3b05131ac4895 Mon Sep 17 00:00:00 2001 From: ljc <1119265069@qq.com> Date: Mon, 30 Nov 2020 21:50:12 +0800 Subject: [PATCH 187/211] =?UTF-8?q?=E5=90=88=E5=90=8C=E6=8F=92=E5=85=A5?= =?UTF-8?q?=E5=85=B6=E4=BB=96=E7=AD=BE=E7=BA=A6=E6=96=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/soft/line/mapper/ContractInfoMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml b/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml index d90f771..2957273 100644 --- a/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml +++ b/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml @@ -51,7 +51,7 @@ `contract_nature`,`contract_content` ) values (#{depId,jdbcType=DECIMAL}, #{contractName,jdbcType=VARCHAR},#{contractType,jdbcType=VARCHAR}, #{proId,jdbcType=VARCHAR}, - #{totalAmount,jdbcType=DECIMAL}, #{partA,jdbcType=VARCHAR}, #{partB,jdbcType=VARCHAR}, #{partB,jdbcType=VARCHAR}, + #{totalAmount,jdbcType=DECIMAL}, #{partA,jdbcType=VARCHAR}, #{partB,jdbcType=VARCHAR}, #{partC,jdbcType=VARCHAR}, #{signTime,jdbcType=TIMESTAMP}, #{signAddr,jdbcType=VARCHAR}, #{beginDate,jdbcType=TIMESTAMP}, #{endDate,jdbcType=TIMESTAMP}, #{payment,jdbcType=VARCHAR}, #{note,jdbcType=VARCHAR}, #{modifyPerson,jdbcType=VARCHAR}, #{contractNature,jdbcType=VARCHAR},#{contractContent,jdbcType=VARCHAR} -- Gitee From 08f6e3cdbb2b0d3d2ca66d22024c435a0b6c4d18 Mon Sep 17 00:00:00 2001 From: ljc <1119265069@qq.com> Date: Mon, 30 Nov 2020 23:31:32 +0800 Subject: [PATCH 188/211] =?UTF-8?q?=E8=AF=81=E4=B9=A6=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/soft/line/util/poi/PoiUtils.java | 71 ++++++++++--------- 1 file changed, 36 insertions(+), 35 deletions(-) diff --git a/src/main/java/com/soft/line/util/poi/PoiUtils.java b/src/main/java/com/soft/line/util/poi/PoiUtils.java index 8fbf61e..6b5cfdf 100644 --- a/src/main/java/com/soft/line/util/poi/PoiUtils.java +++ b/src/main/java/com/soft/line/util/poi/PoiUtils.java @@ -39,40 +39,40 @@ public class PoiUtils { //创建标题行 HSSFRow r0 = sheet.createRow(0); HSSFCell c0 = r0.createCell(0); - c0.setCellValue("证书编号"); + c0.setCellValue("证书名称"); c0.setCellStyle(headerStyle); HSSFCell c1 = r0.createCell(1); c1.setCellStyle(headerStyle); - c1.setCellValue("证书类型"); + c1.setCellValue("证书编号"); HSSFCell c2 = r0.createCell(2); c2.setCellStyle(headerStyle); - c2.setCellValue("证书名称"); + c2.setCellValue("证书类型"); HSSFCell c3 = r0.createCell(3); c3.setCellStyle(headerStyle); c3.setCellValue("颁发单位"); HSSFCell c4 = r0.createCell(4); c4.setCellStyle(headerStyle); - c4.setCellValue("起始日期"); + c4.setCellValue("颁发日期"); HSSFCell c5 = r0.createCell(5); c5.setCellStyle(headerStyle); - c5.setCellValue("终止日期"); + c5.setCellValue("起始日期"); HSSFCell c6 = r0.createCell(6); c6.setCellStyle(headerStyle); - c6.setCellValue("备注"); + c6.setCellValue("终止日期"); HSSFCell c7 = r0.createCell(7); c7.setCellStyle(headerStyle); - c7.setCellValue("颁发日期"); + c7.setCellValue("备注"); for (int i = 0; i < list.size(); i++) { CertificateInfo cert = list.get(i); HSSFRow row = sheet.createRow(i + 1); - row.createCell(0).setCellValue(cert.getCertId()); - row.createCell(1).setCellValue(cert.getCertType()); - row.createCell(2).setCellValue(cert.getCertName()); + row.createCell(0).setCellValue(cert.getCertName()); + row.createCell(1).setCellValue(cert.getCertId()); + row.createCell(2).setCellValue(cert.getCertType()); row.createCell(3).setCellValue(cert.getCertUnit()); - row.createCell(4).setCellValue(dateToString(cert.getBeginDate())); - row.createCell(5).setCellValue(dateToString(cert.getEndDate())); - row.createCell(6).setCellValue(cert.getNote()); - row.createCell(7).setCellValue(dateToString(cert.getIssueDate())); + row.createCell(4).setCellValue(dateToString(cert.getIssueDate())); + row.createCell(5).setCellValue(dateToString(cert.getBeginDate())); + row.createCell(6).setCellValue(dateToString(cert.getEndDate())); + row.createCell(7).setCellValue(cert.getNote()); } ByteArrayOutputStream baos = new ByteArrayOutputStream(); try { @@ -257,6 +257,16 @@ public class PoiUtils { LasCodeItem lasCodeItem = null; switch (k) { case 0: + //证书名称 + if (cellValue == null || "".equals(cellValue)) { + warningMsg += "第" + j + "行证书名称不存在 "; + } else if (cellValue.length() > 100) { + warningMsg += "第" + j + "行证书名称应不大于100字 "; + } else { + cert.setCertName(cellValue); + } + break; + case 1: //证书编号 if (cellValue != null && !"".equals(cellValue) && certificateInfoService.countByCId(null, cellValue) > 0) { warningMsg += "第" + j + "行存在相同的证书编号 "; @@ -264,7 +274,7 @@ public class PoiUtils { cert.setCertId(cellValue); } break; - case 1: + case 2: //证书类型 lasCodeItem = codeDetailService.selectByItemDesc("103", cellValue); if (lasCodeItem == null) { @@ -273,16 +283,6 @@ public class PoiUtils { cert.setCertType(lasCodeItem.getItemVal()); } break; - case 2: - //证书名称 - if (cellValue == null || "".equals(cellValue)) { - warningMsg += "第" + j + "行证书名称不存在 "; - } else if (cellValue.length() > 100) { - warningMsg += "第" + j + "行证书名称应不大于100字 "; - } else { - cert.setCertName(cellValue); - } - break; case 3: //颁发单位 if (cellValue == null || "".equals(cellValue)) { @@ -292,6 +292,14 @@ public class PoiUtils { } break; case 4: + //颁发日期 + if (cellValue != null && !"".equals(cellValue) && !isDate(cellValue)) { + warningMsg += "第" + j + "行颁发日期格式错误!日期样式：【20100101】"; + } else { + cert.setIssueDate(StringToDate(cellValue)); + } + break; + case 5: //发证日期 if (cellValue != null && !"".equals(cellValue) && !isDate(cellValue)) { warningMsg += "第" + j + "行发证日期格式错误!日期样式：【20100101】"; @@ -299,7 +307,7 @@ public class PoiUtils { cert.setBeginDate(StringToDate(cellValue)); } break; - case 5: + case 6: //到期日期 if (cellValue != null && !"".equals(cellValue) && !isDate(cellValue)) { warningMsg += "第" + j + "行到期日期格式错误!日期样式：【20100101】"; @@ -311,18 +319,11 @@ public class PoiUtils { cert.setEndDate(StringToDate(cellValue)); } break; - case 6: + case 7: //备注 cert.setNote(cellValue); break; - case 7: - //颁发日期 - if (cellValue != null && !"".equals(cellValue) && !isDate(cellValue)) { - warningMsg += "第" + j + "行颁发日期格式错误!日期样式：【20100101】"; - } else { - cert.setIssueDate(StringToDate(cellValue)); - } - break; + } } certificateInfoList.add(cert); -- Gitee From a16659e525b322f73d32578dd8b951655f9cf118 Mon Sep 17 00:00:00 2001 From: ljc Date: Tue, 1 Dec 2020 16:43:01 +0800 Subject: [PATCH 189/211] =?UTF-8?q?=E5=90=88=E5=90=8C=E8=AF=81=E4=B9=A6?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=EF=BC=8C=E6=97=A5=E6=9C=9F=E5=AD=97=E7=AC=A6?= =?UTF-8?q?=E4=B8=B2=E4=B8=BA=E7=A9=BA=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CertificateInfoController.java | 2 +- .../controller/ContractInfoController.java | 2 +- .../java/com/soft/line/util/poi/PoiUtils.java | 77 ++++++++++--------- 3 files changed, 42 insertions(+), 39 deletions(-) diff --git a/src/main/java/com/soft/line/controller/CertificateInfoController.java b/src/main/java/com/soft/line/controller/CertificateInfoController.java index c70b079..636c450 100644 --- a/src/main/java/com/soft/line/controller/CertificateInfoController.java +++ b/src/main/java/com/soft/line/controller/CertificateInfoController.java @@ -114,7 +114,7 @@ public class CertificateInfoController { Map map = PoiUtils.excel2Certificate(file,codeDetailService,certificateInfoService); String warningMsg = (String)map.get("warningMsg"); if (warningMsg.length()>0){ - return CommonResult.success(warningMsg); + return CommonResult.failed(warningMsg); }else{ List certificateInfoList = (List)map.get("certificateInfoList"); certificateInfoService.insertRecord(certificateInfoList); diff --git a/src/main/java/com/soft/line/controller/ContractInfoController.java b/src/main/java/com/soft/line/controller/ContractInfoController.java index 8eab6d7..7c224fa 100644 --- a/src/main/java/com/soft/line/controller/ContractInfoController.java +++ b/src/main/java/com/soft/line/controller/ContractInfoController.java @@ -89,7 +89,7 @@ public class ContractInfoController { Map map = PoiUtils.excel2ContractInfo(file,codeDetailService,contractInfoService); String warningMsg = (String)map.get("warningMsg"); if (warningMsg.length()>0){ - return CommonResult.success(warningMsg); + return CommonResult.failed(warningMsg); }else{ contractInfoList = (List)map.get("contractInfoList"); contractInfoService.insertList(contractInfoList); diff --git a/src/main/java/com/soft/line/util/poi/PoiUtils.java b/src/main/java/com/soft/line/util/poi/PoiUtils.java index 6b5cfdf..7b129cb 100644 --- a/src/main/java/com/soft/line/util/poi/PoiUtils.java +++ b/src/main/java/com/soft/line/util/poi/PoiUtils.java @@ -259,9 +259,9 @@ public class PoiUtils { case 0: //证书名称 if (cellValue == null || "".equals(cellValue)) { - warningMsg += "第" + j + "行证书名称不存在 "; + warningMsg += "第" + j + "行证书名称不存在 "+chgrow; } else if (cellValue.length() > 100) { - warningMsg += "第" + j + "行证书名称应不大于100字 "; + warningMsg += "第" + j + "行证书名称应不大于100字 "+chgrow; } else { cert.setCertName(cellValue); } @@ -269,7 +269,7 @@ public class PoiUtils { case 1: //证书编号 if (cellValue != null && !"".equals(cellValue) && certificateInfoService.countByCId(null, cellValue) > 0) { - warningMsg += "第" + j + "行存在相同的证书编号 "; + warningMsg += "第" + j + "行存在相同的证书编号 "+chgrow; } else { cert.setCertId(cellValue); } @@ -278,7 +278,7 @@ public class PoiUtils { //证书类型 lasCodeItem = codeDetailService.selectByItemDesc("103", cellValue); if (lasCodeItem == null) { - warningMsg += "第" + j + "行证书类型不存在 "; + warningMsg += "第" + j + "行证书类型不存在 "+chgrow; } else { cert.setCertType(lasCodeItem.getItemVal()); } @@ -286,7 +286,7 @@ public class PoiUtils { case 3: //颁发单位 if (cellValue == null || "".equals(cellValue)) { - warningMsg += "第" + j + "行发奖单位为空 "; + warningMsg += "第" + j + "行发奖单位为空 "+chgrow; } else { cert.setCertUnit(cellValue); } @@ -294,7 +294,7 @@ public class PoiUtils { case 4: //颁发日期 if (cellValue != null && !"".equals(cellValue) && !isDate(cellValue)) { - warningMsg += "第" + j + "行颁发日期格式错误!日期样式：【20100101】"; + warningMsg += "第" + j + "行颁发日期格式错误!日期样式：【20100101】"+chgrow; } else { cert.setIssueDate(StringToDate(cellValue)); } @@ -302,7 +302,7 @@ public class PoiUtils { case 5: //发证日期 if (cellValue != null && !"".equals(cellValue) && !isDate(cellValue)) { - warningMsg += "第" + j + "行发证日期格式错误!日期样式：【20100101】"; + warningMsg += "第" + j + "行发证日期格式错误!日期样式：【20100101】"+chgrow; } else { cert.setBeginDate(StringToDate(cellValue)); } @@ -310,10 +310,10 @@ public class PoiUtils { case 6: //到期日期 if (cellValue != null && !"".equals(cellValue) && !isDate(cellValue)) { - warningMsg += "第" + j + "行到期日期格式错误!日期样式：【20100101】"; + warningMsg += "第" + j + "行到期日期格式错误!日期样式：【20100101】"+chgrow; } else if (cert.getBeginDate() != null && cert.getEndDate() != null) { if (cert.getBeginDate().after(cert.getEndDate())) { - warningMsg += "第" + j + "行发证日期大于到期日期 "; + warningMsg += "第" + j + "行发证日期大于到期日期 "+chgrow; } } else { cert.setEndDate(StringToDate(cellValue)); @@ -343,6 +343,7 @@ public class PoiUtils { String warningMsg = ""; List contractInfoList = new ArrayList(); ContractInfo cont = null; + String chgrow = "\r\n"; try { String fileName = file.getOriginalFilename(); boolean isExcel2003 = true; @@ -391,7 +392,7 @@ public class PoiUtils { case 0: //部门 if (cellValue == null || "".equals(cellValue)) { - warningMsg += "第" + j + "行部门名称为空 "; + warningMsg += "第" + j + "行部门名称为空 "+chgrow; } else { LasDepartmentInfo dp = codeDetailService.selectSuperiorDepByDepName(cellValue); if (dp == null) { @@ -404,11 +405,11 @@ public class PoiUtils { case 1: //合同名称 if (cellValue == null || "".equals(cellValue)) { - warningMsg += "第" + j + "行合同名称为空 "; + warningMsg += "第" + j + "行合同名称为空 "+chgrow; } else if (contractInfoService.countContractByIdAndName(null, cellValue) > 0) { - warningMsg += "第" + j + "行存在相同的合同名称 "; + warningMsg += "第" + j + "行存在相同的合同名称 "+chgrow; } else if (cellValue.length() > 100) { - warningMsg += "第" + j + "行合同名称应不大于100字 "; + warningMsg += "第" + j + "行合同名称应不大于100字 "+chgrow; } else { cont.setContractName(cellValue); } @@ -417,7 +418,7 @@ public class PoiUtils { //合同类别 lasCodeItem = codeDetailService.selectByItemDesc("102", cellValue); if (lasCodeItem == null) { - warningMsg += "第" + j + "行合同类别不存在 "; + warningMsg += "第" + j + "行合同类别不存在 "+chgrow; } else { cont.setContractType(lasCodeItem.getItemVal()); } @@ -429,9 +430,9 @@ public class PoiUtils { case 4: //总金额 if (cellValue == null || "".equals(cellValue)) { - warningMsg += "第" + j + "行总金额为空 "; + warningMsg += "第" + j + "行总金额为空 "+chgrow; } else if (!isNumber(cellValue)) { - warningMsg += "第" + j + "行总金额不是数字 "; + warningMsg += "第" + j + "行总金额不是数字 "+chgrow; } else { cont.setTotalAmount(new BigDecimal(StringToDoubleUtil.convert(cellValue))); } @@ -439,9 +440,9 @@ public class PoiUtils { case 5: //甲方 if (cellValue == null || "".equals(cellValue)) { - warningMsg += "第" + j + "行甲方为空 "; + warningMsg += "第" + j + "行甲方为空 "+chgrow; } else if (cellValue.length() > 100) { - warningMsg += "第" + j + "行甲方名称应不大于100字 "; + warningMsg += "第" + j + "行甲方名称应不大于100字 "+chgrow; } else { cont.setPartA(cellValue); } @@ -449,9 +450,9 @@ public class PoiUtils { case 6: //乙方 if (cellValue == null || "".equals(cellValue)) { - warningMsg += "第" + j + "行乙方为空 "; + warningMsg += "第" + j + "行乙方为空 "+chgrow; } else if (cellValue.length() > 100) { - warningMsg += "第" + j + "行合乙方称应不大于100字 "; + warningMsg += "第" + j + "行合乙方称应不大于100字 "+chgrow; } else { cont.setPartB(cellValue); } @@ -459,7 +460,7 @@ public class PoiUtils { case 7: //其他签约方 if (cellValue != null && !"".equals(cellValue) && cellValue.length() > 100) { - warningMsg += "第" + j + "行其他签约方名称应不大于100字 "; + warningMsg += "第" + j + "行其他签约方名称应不大于100字 "+chgrow; } else { cont.setPartC(cellValue); } @@ -467,7 +468,7 @@ public class PoiUtils { case 8: //签约日期 if (!isDate(cellValue)) { - warningMsg += "第" + j + "行签约日期格式错误!日期样式：【20100101】"; + warningMsg += "第" + j + "行签约日期格式错误!日期样式：【20100101】"+chgrow; } else { cont.setSignTime(StringToDate(cellValue)); } @@ -475,7 +476,7 @@ public class PoiUtils { case 9: //签约地点 if (cellValue == null || "".equals(cellValue)) { - warningMsg += "第" + j + "行签约地点为空"; + warningMsg += "第" + j + "行签约地点为空"+chgrow; } else { cont.setSignAddr(cellValue); } @@ -483,7 +484,7 @@ public class PoiUtils { case 10: //起始日期 if (!isDate(cellValue)) { - warningMsg += "第" + j + "行起始日期格式错误!日期样式：【20100101】"; + warningMsg += "第" + j + "行起始日期格式错误!日期样式：【20100101】"+chgrow; } else { cont.setBeginDate(StringToDate(cellValue)); } @@ -491,13 +492,13 @@ public class PoiUtils { case 11: //终止日期 if (!isDate(cellValue)) { - warningMsg += "第" + j + "行终止日期格式错误!日期样式：【20100101】"; + warningMsg += "第" + j + "行终止日期格式错误!日期样式：【20100101】"+chgrow; } else { cont.setEndDate(StringToDate(cellValue)); } if (cont.getBeginDate() != null && cont.getEndDate() != null) { if (cont.getBeginDate().after(cont.getEndDate())) { - warningMsg += "第" + j + "行起始日期大于终止日期 "; + warningMsg += "第" + j + "行起始日期大于终止日期 "+chgrow; } } break; @@ -505,9 +506,9 @@ public class PoiUtils { case 12: //付款方式 if (cellValue == null || "".equals(cellValue)) { - warningMsg += "第" + j + "行付款方式为空 "; + warningMsg += "第" + j + "行付款方式为空 "+chgrow; } else if (cellValue.length() > 500) { - warningMsg += "第" + j + "行付款方式应不大于500字 "; + warningMsg += "第" + j + "行付款方式应不大于500字 "+chgrow; } else { cont.setPayment(cellValue); } @@ -515,7 +516,7 @@ public class PoiUtils { case 13: //备注 if (cellValue != null && !"".equals(cellValue) && cellValue.length() > 1000) { - warningMsg += "第" + j + "行备注应不大于1000字 "; + warningMsg += "第" + j + "行备注应不大于1000字 "+chgrow; } else { cont.setNote(cellValue); } @@ -524,7 +525,7 @@ public class PoiUtils { //合同性质 lasCodeItem = codeDetailService.selectByItemDesc("104", cellValue); if (lasCodeItem == null) { - warningMsg += "第" + j + "行合同性质不存在 "; + warningMsg += "第" + j + "行合同性质不存在 "+chgrow; } else { cont.setContractNature(lasCodeItem.getItemVal()); } @@ -532,7 +533,7 @@ public class PoiUtils { case 15: //合同内容 if (cellValue != null && !"".equals(cellValue) && cellValue.length() > 1000) { - warningMsg += "第" + j + "行合同内容应不大于1000字 "; + warningMsg += "第" + j + "行合同内容应不大于1000字 "+chgrow; } else { cont.setContractContent(cellValue); } @@ -619,16 +620,18 @@ public class PoiUtils { } public static Date StringToDate(String source) { - source = source.trim(); - - Date date = null; boolean flag = false; - DateFormat dateFormat = new SimpleDateFormat("yyyyMMdd"); + Date date = null; try { + if(source==null){ + return date; + } + source = source.trim(); + DateFormat dateFormat = new SimpleDateFormat("yyyyMMdd"); date = dateFormat.parse(source); flag = true; - } catch (ParseException e) { - // e.printStackTrace(); + } catch (Exception e) { + e.printStackTrace(); } if (flag) { -- Gitee From 77fcae72ccf77594bdd6dd1db421bd51e6dfa6eb Mon Sep 17 00:00:00 2001 From: ljc <1119265069@qq.com> Date: Tue, 1 Dec 2020 23:33:19 +0800 Subject: [PATCH 190/211] =?UTF-8?q?=E5=90=88=E5=90=8C=E9=83=A8=E9=97=A8?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../soft/line/entity/LasDepartmentInfo.java | 2 + .../line/mapper/AppletCertificateMapper.xml | 8 +- .../soft/line/mapper/AppletCommonMapper.xml | 6 +- .../line/mapper/CertificateInfoMapper.xml | 4 +- .../soft/line/mapper/ContractInfoMapper.xml | 30 +++---- .../line/mapper/LasDepartmentInfoMapper.java | 2 +- .../line/mapper/LasDepartmentInfoMapper.xml | 1 + .../service/impl/CodeDetailServiceImpl.java | 4 +- .../line/service/impl/LoginServiceImpl.java | 4 +- .../service/impl/StatisticsServiceImpl.java | 12 +-- .../java/com/soft/line/util/poi/PoiUtils.java | 83 ++++++++++--------- 11 files changed, 77 insertions(+), 79 deletions(-) diff --git a/src/main/java/com/soft/line/entity/LasDepartmentInfo.java b/src/main/java/com/soft/line/entity/LasDepartmentInfo.java index 1de7d7a..3cf5c73 100644 --- a/src/main/java/com/soft/line/entity/LasDepartmentInfo.java +++ b/src/main/java/com/soft/line/entity/LasDepartmentInfo.java @@ -31,4 +31,6 @@ public class LasDepartmentInfo { @JsonFormat(pattern = "yyyy-MM-dd",timezone = "Asia/Shanghai") private Date updateTime; + //公司ID + private String contractDepId; } \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/AppletCertificateMapper.xml b/src/main/java/com/soft/line/mapper/AppletCertificateMapper.xml index 0e4b102..18af5ac 100644 --- a/src/main/java/com/soft/line/mapper/AppletCertificateMapper.xml +++ b/src/main/java/com/soft/line/mapper/AppletCertificateMapper.xml @@ -210,10 +210,10 @@ and cert_name like concat('%',#{certName},'%') - and SUBSTR(begin_date,1,11) >= #{beginDate} + and SUBSTR(end_date,1,11) =]]> #{beginDate} - and SUBSTR(end_date,1,11) <= #{endDate} + and SUBSTR(begin_date,1,11) #{endDate} ORDER BY modify_time desc,id LIMIT #{pageNum},#{dataNum} @@ -242,10 +242,10 @@ and cert_unit like concat('%',#{certUnit},'%') - and SUBSTR(begin_date,1,11) >= #{beginDate} + and SUBSTR(end_date,1,11) =]]> #{beginDate} - and SUBSTR(end_date,1,11) <= #{endDate} + and SUBSTR(begin_date,1,11) #{endDate} diff --git a/src/main/java/com/soft/line/mapper/AppletCommonMapper.xml b/src/main/java/com/soft/line/mapper/AppletCommonMapper.xml index 98f5c52..e106cce 100644 --- a/src/main/java/com/soft/line/mapper/AppletCommonMapper.xml +++ b/src/main/java/com/soft/line/mapper/AppletCommonMapper.xml @@ -5,11 +5,7 @@ diff --git a/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml b/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml index 2957273..481fd4b 100644 --- a/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml +++ b/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml @@ -36,7 +36,7 @@ `contract_nature`,`contract_content` ) values (#{depId,jdbcType=DECIMAL}, #{contractName,jdbcType=VARCHAR},#{contractType,jdbcType=VARCHAR}, #{proId,jdbcType=VARCHAR}, - #{totalAmount,jdbcType=DECIMAL}, #{partA,jdbcType=VARCHAR}, #{partB,jdbcType=VARCHAR}, #{partB,jdbcType=VARCHAR}, + #{totalAmount,jdbcType=DECIMAL}, #{partA,jdbcType=VARCHAR}, #{partB,jdbcType=VARCHAR}, #{partC,jdbcType=VARCHAR}, #{signTime,jdbcType=TIMESTAMP}, #{signAddr,jdbcType=VARCHAR}, #{beginDate,jdbcType=TIMESTAMP}, #{endDate,jdbcType=TIMESTAMP}, #{payment,jdbcType=VARCHAR}, #{note,jdbcType=VARCHAR}, #{modifyPerson,jdbcType=VARCHAR}, #{contractNature,jdbcType=VARCHAR},#{contractContent,jdbcType=VARCHAR} @@ -136,10 +136,10 @@ AND instr(sign_addr,#{signAddr,jdbcType=VARCHAR})>0 - AND begin_date #{beginDate,jdbcType=TIMESTAMP} + AND end_date =]]> #{beginDate,jdbcType=TIMESTAMP} - AND end_date =]]> #{endDate,jdbcType=TIMESTAMP} + AND begin_date #{endDate,jdbcType=TIMESTAMP} - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + insert into `certificate_info` (`cert_id`, `cert_type`, `cert_name`, `issue_date`,`cert_unit`, `begin_date`, `end_date`, `note`, `modify_person`) @@ -28,7 +28,7 @@ #{note,jdbcType=VARCHAR}, #{modifyPerson,jdbcType=VARCHAR}) - + insert into `certificate_info` (`cert_id`, `cert_type`, `cert_name`, `issue_date`,`cert_unit`, `begin_date`, `end_date`, `note`, `modify_person`) @@ -37,11 +37,11 @@ #{note,jdbcType=VARCHAR}, #{modifyPerson,jdbcType=VARCHAR}) - + update `certificate_info` set `del_flg` = '1' where `id` = #{id,jdbcType=INTEGER} - - + + update `certificate_info` set `cert_id` = #{certId,jdbcType=VARCHAR}, `cert_type` = #{certType,jdbcType=VARCHAR}, `cert_name` = #{certName,jdbcType=VARCHAR}, @@ -55,83 +55,86 @@ where `id` = #{id,jdbcType=INTEGER} - select `id`, `cert_id`, `cert_type`, `cert_name`, `issue_date`,`cert_unit`, `begin_date`, `end_date`, `note`, `modify_person`, `modify_time`, `del_flg` from `certificate_info` where `id` = #{id,jdbcType=INTEGER} - + - select `id`, `cert_id`, `cert_type`, `cert_name`,`issue_date`, `cert_unit`, `begin_date`, `end_date`, `note`, `modify_person`, `modify_time`, `del_flg` from `certificate_info` and `del_flg`!='1' WHERE instr(`cert_name`,#{userName，jdbcType=VARCHAR})>0 - + - + - + - SELECT SUBSTR(issue_date, 1, 4) x, count(issue_date) y @@ -143,7 +146,7 @@ SUBSTR(issue_date, 1, 4) - SELECT (select cd.item_desc from las_codeitem cd where cd.item_type_id = 103 and cd.item_val = `cert_type`) x, count(*) y @@ -154,7 +157,7 @@ GROUP BY cert_type - SELECT (select cd.item_desc from las_codeitem cd where cd.item_type_id = 103 and cd.item_val = `cert_type`) name, count(*) total -- Gitee From 8c6e2a680b2e612147d9d600230603df2dde59f6 Mon Sep 17 00:00:00 2001 From: ljc Date: Mon, 4 Jan 2021 17:27:43 +0800 Subject: [PATCH 201/211] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=94=A8=E6=88=B7-?= =?UTF-8?q?=E5=90=88=E5=90=8C=E9=83=A8=E9=97=A8=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/soft/line/entity/UserConDep.java | 32 +++++++++++++ .../soft/line/mapper/UserConDepMapper.java | 15 ++++++ .../com/soft/line/mapper/UserConDepMapper.xml | 29 +++++++++++ src/main/resources/application-dev.properties | 41 ++++++++++++++++ src/main/resources/application-pro.properties | 41 ++++++++++++++++ src/main/resources/application.properties | 48 +------------------ 6 files changed, 159 insertions(+), 47 deletions(-) create mode 100644 src/main/java/com/soft/line/entity/UserConDep.java create mode 100644 src/main/java/com/soft/line/mapper/UserConDepMapper.java create mode 100644 src/main/java/com/soft/line/mapper/UserConDepMapper.xml create mode 100644 src/main/resources/application-dev.properties create mode 100644 src/main/resources/application-pro.properties diff --git a/src/main/java/com/soft/line/entity/UserConDep.java b/src/main/java/com/soft/line/entity/UserConDep.java new file mode 100644 index 0000000..8b965ae --- /dev/null +++ b/src/main/java/com/soft/line/entity/UserConDep.java @@ -0,0 +1,32 @@ +package com.soft.line.entity; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.hibernate.validator.constraints.Length; + +import javax.validation.constraints.NotNull; +import java.util.Date; + +@Data +@NoArgsConstructor +@AllArgsConstructor +public class UserConDep { + + private Integer id; + + @ApiModelProperty(value = "用户ID") + private Integer userId; + + @ApiModelProperty(value = "合同部门id(item_type_id=101)") + private String contractDepartmentId; + + @ApiModelProperty(value = "修改人") + private String modifyPerson; + + @ApiModelProperty(value = "修改时间") + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "Asia/Shanghai") + private Date modifyTime; +} \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/UserConDepMapper.java b/src/main/java/com/soft/line/mapper/UserConDepMapper.java new file mode 100644 index 0000000..2ae5735 --- /dev/null +++ b/src/main/java/com/soft/line/mapper/UserConDepMapper.java @@ -0,0 +1,15 @@ +package com.soft.line.mapper; + +import com.soft.line.entity.UserConDep; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +public interface UserConDepMapper { + + List selectAll(); + + int insert(@Param("userId")Integer userId, @Param("contractDepartmentId") String contractDepartmentId,@Param("modifyPerson") String modifyPerson); + + int deleteByUserId(Integer userId); +} diff --git a/src/main/java/com/soft/line/mapper/UserConDepMapper.xml b/src/main/java/com/soft/line/mapper/UserConDepMapper.xml new file mode 100644 index 0000000..d238452 --- /dev/null +++ b/src/main/java/com/soft/line/mapper/UserConDepMapper.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + insert into `user_contractdepartment` (`user_id`, `contract_department_id`, `modify_person`) + values (#{userId,jdbcType=INTEGER}, #{contractDepartmentId,jdbcType=VARCHAR}, #{modifyPerson,jdbcType=VARCHAR}) + + + + delete from user_contractdepartment where user_id = #{userId} + + + \ No newline at end of file diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties new file mode 100644 index 0000000..cb72a44 --- /dev/null +++ b/src/main/resources/application-dev.properties @@ -0,0 +1,41 @@ +spring.datasource.url= jdbc:mysql://192.168.1.178:3306/las?characterEncoding=utf-8&useSSL=false +spring.datasource.username=root +spring.datasource.password=root123 +spring.datasource.driver-class-name=com.mysql.jdbc.Driver +#ݿӳ +spring.datasource.type=com.alibaba.druid.pool.DruidDataSource +spring.datasource.druid.initialSize=5 +spring.datasource.druid.minIdle=5 +spring.datasource.druid.maxActive=20 +spring.datasource.druid.maxWait=60000 +spring.datasource.druid.timeBetweenEvictionRunsMillis=60000 +spring.datasource.druid.minEvictableIdleTimeMillis=300000 +spring.datasource.druid.validationQuery=SELECT?1?FROM?DUAL +spring.datasource.druid.testWhileIdle=true +spring.datasource.druid.testOnBorrow=true +spring.datasource.druid.testOnReturn=true +spring.datasource.druid.poolPreparedStatements=true +spring.datasource.druid.filters=stat,wall +spring.datasource.druid.maxPoolPreparedStatementPerConnectionSize=20 +spring.datasource.druid.useGlobalDataSourceStat=true +spring.datasource.druid.connectionProperties=druid.stat.mergeSql=true;druid.stat.slowSqlMillis=500 + +#redisӵַ +spring.jedis.host = 192.168.1.178 +spring.jedis.password= las@123 +spring.jedis.port = 6379 +spring.jedis.uri=redis://192.168.1.178:6379/0 + +spring.jedis.maxTotal=100 +spring.jedis.maxIdle= 10 +spring.jedis.maxWaitMillis =100000 + +spring.http.encoding.force=true +spring.http.encoding.charset=UTF-8 +spring.http.encoding.enabled=true +server.tomcat.uri-encoding=UTF-8 +### ļϴ +# ֵ֧ļ +spring.servlet.multipart.max-file-size=100MB +# ļ +spring.servlet.multipart.max-request-size=100MB \ No newline at end of file diff --git a/src/main/resources/application-pro.properties b/src/main/resources/application-pro.properties new file mode 100644 index 0000000..a564661 --- /dev/null +++ b/src/main/resources/application-pro.properties @@ -0,0 +1,41 @@ +spring.datasource.url= jdbc:mysql://192.168.1.166:3306/las?characterEncoding=utf-8&useSSL=false +spring.datasource.username=root +spring.datasource.password=Leave@2020 +spring.datasource.driver-class-name=com.mysql.jdbc.Driver +#ݿӳ +spring.datasource.type=com.alibaba.druid.pool.DruidDataSource +spring.datasource.druid.initialSize=5 +spring.datasource.druid.minIdle=5 +spring.datasource.druid.maxActive=20 +spring.datasource.druid.maxWait=60000 +spring.datasource.druid.timeBetweenEvictionRunsMillis=60000 +spring.datasource.druid.minEvictableIdleTimeMillis=300000 +spring.datasource.druid.validationQuery=SELECT?1?FROM?DUAL +spring.datasource.druid.testWhileIdle=true +spring.datasource.druid.testOnBorrow=true +spring.datasource.druid.testOnReturn=true +spring.datasource.druid.poolPreparedStatements=true +spring.datasource.druid.filters=stat,wall +spring.datasource.druid.maxPoolPreparedStatementPerConnectionSize=20 +spring.datasource.druid.useGlobalDataSourceStat=true +spring.datasource.druid.connectionProperties=druid.stat.mergeSql=true;druid.stat.slowSqlMillis=500 + +#redisӵַ +spring.jedis.host = 192.168.1.166 +spring.jedis.password= las@123 +spring.jedis.port = 6379 +spring.jedis.uri=redis://192.168.1.166:6379/0 + +spring.jedis.maxTotal=100 +spring.jedis.maxIdle= 10 +spring.jedis.maxWaitMillis =100000 + +spring.http.encoding.force=true +spring.http.encoding.charset=UTF-8 +spring.http.encoding.enabled=true +server.tomcat.uri-encoding=UTF-8 +### ļϴ +# ֵ֧ļ +spring.servlet.multipart.max-file-size=100MB +# ļ +spring.servlet.multipart.max-request-size=100MB \ No newline at end of file diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index a61c78a..ce67c4d 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,43 +1,7 @@ server.port=9101 server.servlet.context-path=/softline -#spring.datasource.url= jdbc:mysql://175.24.112.245:3306/rz_archives?characterEncoding=utf-8&useSSL=false -#spring.datasource.url= jdbc:mysql://127.0.0.1:3306/rz_archives?characterEncoding=utf-8&useSSL=false -spring.datasource.url= jdbc:mysql://192.168.1.178:3306/las?characterEncoding=utf-8&useSSL=false -#spring.datasource.url= jdbc:mysql://192.168.1.166:3306/las?characterEncoding=utf-8&useSSL=false -spring.datasource.username=root -spring.datasource.password=root123 -#spring.datasource.password=Leave@2020 -spring.datasource.driver-class-name=com.mysql.jdbc.Driver -#ݿӳ -spring.datasource.type=com.alibaba.druid.pool.DruidDataSource -spring.datasource.druid.initialSize=5 -spring.datasource.druid.minIdle=5 -spring.datasource.druid.maxActive=20 -spring.datasource.druid.maxWait=60000 -spring.datasource.druid.timeBetweenEvictionRunsMillis=60000 -spring.datasource.druid.minEvictableIdleTimeMillis=300000 -spring.datasource.druid.validationQuery=SELECT?1?FROM?DUAL -spring.datasource.druid.testWhileIdle=true -spring.datasource.druid.testOnBorrow=true -spring.datasource.druid.testOnReturn=true -spring.datasource.druid.poolPreparedStatements=true -spring.datasource.druid.filters=stat,wall -spring.datasource.druid.maxPoolPreparedStatementPerConnectionSize=20 -spring.datasource.druid.useGlobalDataSourceStat=true -spring.datasource.druid.connectionProperties=druid.stat.mergeSql=true;druid.stat.slowSqlMillis=500 -#redisӵַ -spring.jedis.host = 192.168.1.178 -#spring.jedis.host = 192.168.1.166 -#spring.jedis.password= 123456 -spring.jedis.password= las@123 -spring.jedis.port = 6379 -spring.jedis.uri=redis://192.168.1.178:6379/0 -#spring.jedis.uri=redis://192.168.1.166:6379/0 - -spring.jedis.maxTotal=100 -spring.jedis.maxIdle= 10 -spring.jedis.maxWaitMillis =100000 +spring.profiles.active=dev #mybatis log logging.level.com.soft.line.mapper = debug @@ -61,13 +25,3 @@ uploadFileDir=/user/softline-files-manage-uploadFiles/ #ļϴӳַ uploadFileMapping=uploadFiles/ - -spring.http.encoding.force=true -spring.http.encoding.charset=UTF-8 -spring.http.encoding.enabled=true -server.tomcat.uri-encoding=UTF-8 -### ļϴ -# ֵ֧ļ -spring.servlet.multipart.max-file-size=100MB -# ļ -spring.servlet.multipart.max-request-size=100MB \ No newline at end of file -- Gitee From 382d61c2f136a91aefe73418c37d3737ebb68374 Mon Sep 17 00:00:00 2001 From: ljc Date: Tue, 5 Jan 2021 16:30:12 +0800 Subject: [PATCH 202/211] =?UTF-8?q?=E7=94=A8=E6=88=B7-=E5=90=88=E5=90=8C?= =?UTF-8?q?=E9=83=A8=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/LasUserInfoController.java | 35 ++++++++ .../line/controller/UserConDepController.java | 61 ++++++++++++++ .../soft/line/mapper/LasUserInfoMapper.java | 9 ++ .../soft/line/mapper/LasUserInfoMapper.xml | 83 +++++++++++++++---- .../soft/line/mapper/UserConDepMapper.java | 5 +- .../com/soft/line/mapper/UserConDepMapper.xml | 17 +++- .../soft/line/service/LasUserInfoService.java | 19 +++++ .../soft/line/service/UserConDepService.java | 16 ++++ .../service/impl/LasUserInfoServiceImpl.java | 50 +++++++++++ .../service/impl/RoleInfoServiceImpl.java | 10 +++ .../service/impl/UserConDepServiceImpl.java | 56 +++++++++++++ 11 files changed, 338 insertions(+), 23 deletions(-) create mode 100644 src/main/java/com/soft/line/controller/LasUserInfoController.java create mode 100644 src/main/java/com/soft/line/controller/UserConDepController.java create mode 100644 src/main/java/com/soft/line/service/LasUserInfoService.java create mode 100644 src/main/java/com/soft/line/service/UserConDepService.java create mode 100644 src/main/java/com/soft/line/service/impl/LasUserInfoServiceImpl.java create mode 100644 src/main/java/com/soft/line/service/impl/UserConDepServiceImpl.java diff --git a/src/main/java/com/soft/line/controller/LasUserInfoController.java b/src/main/java/com/soft/line/controller/LasUserInfoController.java new file mode 100644 index 0000000..d8f6a4f --- /dev/null +++ b/src/main/java/com/soft/line/controller/LasUserInfoController.java @@ -0,0 +1,35 @@ +package com.soft.line.controller; + +import com.soft.line.service.LasUserInfoService; +import com.soft.line.util.exception.CommonResult; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.Map; + +@Api(description = "用户相关接口") +@RestController +@RequestMapping("/systemAdmin") +public class LasUserInfoController { + + @Autowired + public LasUserInfoService lasUserInfoService; + + /** + * 获取符合添加用户合同部门关系的用户 + * @return + */ + @ApiOperation(value = "获取符合添加用户合同部门关系的用户", notes = "获取符合添加用户合同部门关系的用户") + @PostMapping("/selectUserInfoForConDep") + public CommonResult selectUserInfoForConDep(@RequestBody Map map){ + return CommonResult.success(lasUserInfoService.selectUserInfoForConDep()); + } +} diff --git a/src/main/java/com/soft/line/controller/UserConDepController.java b/src/main/java/com/soft/line/controller/UserConDepController.java new file mode 100644 index 0000000..b5e2f8b --- /dev/null +++ b/src/main/java/com/soft/line/controller/UserConDepController.java @@ -0,0 +1,61 @@ +package com.soft.line.controller; + +import com.soft.line.service.LasUserInfoService; +import com.soft.line.service.UserConDepService; +import com.soft.line.util.exception.CommonResult; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.Map; + +@Api(description = "用户合同部门相关接口") +@RestController +@RequestMapping("/systemAdmin") +public class UserConDepController { + + @Autowired + private UserConDepService userConDepService; + + @Autowired + private LasUserInfoService lasUserInfoService; + + @PostMapping("/userConDeps") + @ApiOperation(value = "获取所有用户合同部门") + public CommonResult getAllMenus(@RequestBody Map map) { + return CommonResult.success(userConDepService.selectUserConDep(map)); + } + + @DeleteMapping("/userConDep") + @ApiOperation(value = "删除用户合同部门") + public CommonResult deleteRole(@RequestBody Map map) { + userConDepService.delete(map); + return CommonResult.success("删除成功"); + } + + @PostMapping("/role") + @ApiOperation(value = "保存用户合同部门") + public CommonResult saveRole(@RequestBody Map map) { + if (map.get("userId")==null||"".equals(map.get("userId"))) { + return CommonResult.failed("用户名称不能为空"); + }else{ + List depList = (List)map.get("depList"); + Integer userId=(Integer) map.get("userId"); + // 归档登记员可以看全部合同部门； + if (lasUserInfoService.isAssistantManager(userId)){ + + }else if (lasUserInfoService.isDepManager(userId)){ + // 总经理室的副总经理可以看两个合同部门； + }else if (lasUserInfoService.isAssistantManager(userId)){ + // 部门经理可以看当前部门 + if (depList.size()!=1){ + return CommonResult.failed("部门经理可以看当前部门"); + } + } + userConDepService.save(map); + return CommonResult.success("保存成功"); + } + } +} diff --git a/src/main/java/com/soft/line/mapper/LasUserInfoMapper.java b/src/main/java/com/soft/line/mapper/LasUserInfoMapper.java index c4b9990..76cbc92 100644 --- a/src/main/java/com/soft/line/mapper/LasUserInfoMapper.java +++ b/src/main/java/com/soft/line/mapper/LasUserInfoMapper.java @@ -2,6 +2,7 @@ package com.soft.line.mapper; import com.soft.line.entity.LasUserInfo; +import java.util.List; import java.util.Map; public interface LasUserInfoMapper { @@ -21,4 +22,12 @@ public interface LasUserInfoMapper { */ LasUserInfo userLogin(Map map); + List selectUserForConDep(); + + int countRegister(Integer userId); + + int countDepManager(Integer userId); + + int countAssistantManager(Integer userId); + } \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/LasUserInfoMapper.xml b/src/main/java/com/soft/line/mapper/LasUserInfoMapper.xml index 99945d3..e282bad 100644 --- a/src/main/java/com/soft/line/mapper/LasUserInfoMapper.xml +++ b/src/main/java/com/soft/line/mapper/LasUserInfoMapper.xml @@ -1,23 +1,23 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + - SELECT u_info.id, u_info.username, @@ -33,7 +33,7 @@ and u_info.id = #{id,jdbcType=INTEGER} - SELECT u_info.id, u_info.username, @@ -50,5 +50,52 @@ and u_info.passwords = #{password,jdbcType=VARCHAR} and u_info.user_status='Y' + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/UserConDepMapper.java b/src/main/java/com/soft/line/mapper/UserConDepMapper.java index 2ae5735..a041ea6 100644 --- a/src/main/java/com/soft/line/mapper/UserConDepMapper.java +++ b/src/main/java/com/soft/line/mapper/UserConDepMapper.java @@ -1,5 +1,6 @@ package com.soft.line.mapper; +import com.soft.line.entity.LasUserInfo; import com.soft.line.entity.UserConDep; import org.apache.ibatis.annotations.Param; @@ -7,7 +8,9 @@ import java.util.List; public interface UserConDepMapper { - List selectAll(); + List selectAllUser(@Param("userName")String userName); + + List selectAllConDep(@Param("userId")Integer userId); int insert(@Param("userId")Integer userId, @Param("contractDepartmentId") String contractDepartmentId,@Param("modifyPerson") String modifyPerson); diff --git a/src/main/java/com/soft/line/mapper/UserConDepMapper.xml b/src/main/java/com/soft/line/mapper/UserConDepMapper.xml index d238452..78cc9b0 100644 --- a/src/main/java/com/soft/line/mapper/UserConDepMapper.xml +++ b/src/main/java/com/soft/line/mapper/UserConDepMapper.xml @@ -12,10 +12,6 @@ - insert into `user_contractdepartment` (`user_id`, `contract_department_id`, `modify_person`) @@ -26,4 +22,17 @@ delete from user_contractdepartment where user_id = #{userId} + + + + \ No newline at end of file diff --git a/src/main/java/com/soft/line/service/LasUserInfoService.java b/src/main/java/com/soft/line/service/LasUserInfoService.java new file mode 100644 index 0000000..af22004 --- /dev/null +++ b/src/main/java/com/soft/line/service/LasUserInfoService.java @@ -0,0 +1,19 @@ +package com.soft.line.service; + +import com.soft.line.entity.LasUserInfo; + +import java.util.List; + +public interface LasUserInfoService { + + public List selectUserInfoForConDep(); + + //判断是否为归档登记员 + public boolean isRegister(Integer userId); + + //判断是否为部门经理 + public boolean isDepManager(Integer userId); + + //判断是否为总经理室的副总经理 + public boolean isAssistantManager(Integer userId); +} diff --git a/src/main/java/com/soft/line/service/UserConDepService.java b/src/main/java/com/soft/line/service/UserConDepService.java new file mode 100644 index 0000000..e6f6229 --- /dev/null +++ b/src/main/java/com/soft/line/service/UserConDepService.java @@ -0,0 +1,16 @@ +package com.soft.line.service; + +import com.github.pagehelper.PageInfo; + +import java.util.List; +import java.util.Map; + +public interface UserConDepService { + + PageInfo>> selectUserConDep(Map map); + + public void delete(Map map); + + public void save(Map map); + +} diff --git a/src/main/java/com/soft/line/service/impl/LasUserInfoServiceImpl.java b/src/main/java/com/soft/line/service/impl/LasUserInfoServiceImpl.java new file mode 100644 index 0000000..7392e96 --- /dev/null +++ b/src/main/java/com/soft/line/service/impl/LasUserInfoServiceImpl.java @@ -0,0 +1,50 @@ +package com.soft.line.service.impl; + +import com.soft.line.entity.LasUserInfo; +import com.soft.line.mapper.LasUserInfoMapper; +import com.soft.line.service.LasUserInfoService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +@Slf4j +public class LasUserInfoServiceImpl implements LasUserInfoService { + + @Autowired + private LasUserInfoMapper lasUserInfoMapper; + + @Override + public List selectUserInfoForConDep() { + return lasUserInfoMapper.selectUserForConDep(); + } + + @Override + public boolean isRegister(Integer userId) { + boolean flg = false; + if (lasUserInfoMapper.countRegister(userId) > 0) { + flg = true; + } + return flg; + } + + @Override + public boolean isDepManager(Integer userId) { + boolean flg = false; + if (lasUserInfoMapper.countDepManager(userId) > 0) { + flg = true; + } + return flg; + } + + @Override + public boolean isAssistantManager(Integer userId) { + boolean flg = false; + if (lasUserInfoMapper.countAssistantManager(userId) > 0) { + flg = true; + } + return flg; + } +} diff --git a/src/main/java/com/soft/line/service/impl/RoleInfoServiceImpl.java b/src/main/java/com/soft/line/service/impl/RoleInfoServiceImpl.java index d2ea6a3..43d8dac 100644 --- a/src/main/java/com/soft/line/service/impl/RoleInfoServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/RoleInfoServiceImpl.java @@ -4,6 +4,8 @@ import com.github.pagehelper.PageInfo; import com.soft.line.entity.ButtonInfo; import com.soft.line.entity.MenuInfo; import com.soft.line.entity.RoleInfo; +import com.soft.line.filter.HttpRequestUtil; +import com.soft.line.filter.UserTokenDto; import com.soft.line.mapper.ButtonInfoMapper; import com.soft.line.mapper.MenuInfoMapper; import com.soft.line.mapper.RoleInfoMapper; @@ -76,6 +78,10 @@ public class RoleInfoServiceImpl implements RoleInfoService { public void add(Map map) { String roleName = (String)map.get("roleName"); String modifyPerson = "admin"; + UserTokenDto userToken= HttpRequestUtil.getUserToken(); + if(userToken!=null){ + modifyPerson=userToken.getUserInfo().getUserName(); + } map.put("modifyPerson",modifyPerson); map.put("modifyTime",new Date()); roleInfoMapper.insert(map); @@ -93,6 +99,10 @@ public class RoleInfoServiceImpl implements RoleInfoService { public void update(Map map) { Integer roleId =(Integer)map.get("id"); String modifyPerson = "admin"; + UserTokenDto userToken= HttpRequestUtil.getUserToken(); + if(userToken!=null){ + modifyPerson=userToken.getUserInfo().getUserName(); + } map.put("modifyPerson",modifyPerson); map.put("modifyTime",new Date()); roleInfoMapper.update(map); diff --git a/src/main/java/com/soft/line/service/impl/UserConDepServiceImpl.java b/src/main/java/com/soft/line/service/impl/UserConDepServiceImpl.java new file mode 100644 index 0000000..6a7c928 --- /dev/null +++ b/src/main/java/com/soft/line/service/impl/UserConDepServiceImpl.java @@ -0,0 +1,56 @@ +package com.soft.line.service.impl; + +import com.github.pagehelper.PageInfo; +import com.soft.line.entity.LasUserInfo; +import com.soft.line.entity.UserConDep; +import com.soft.line.filter.HttpRequestUtil; +import com.soft.line.filter.UserTokenDto; +import com.soft.line.mapper.UserConDepMapper; +import com.soft.line.service.UserConDepService; +import com.soft.line.util.pagehelper.PageUtil; +import org.springframework.beans.factory.annotation.Autowired; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +public class UserConDepServiceImpl implements UserConDepService { + + @Autowired + public UserConDepMapper userConDepMapper; + + @Override + public PageInfo>> selectUserConDep(Map map) { + PageUtil.setPageParam(map); + List> reultList = new ArrayList>(); + for (LasUserInfo userInfo:userConDepMapper.selectAllUser((String)map.get("userName"))){ + Map resultMap = new HashMap(); + resultMap.put("userName",userInfo.getUserName()); + resultMap.put("userId",userInfo.getId()); + List userConDeps=userConDepMapper.selectAllConDep(userInfo.getId()); + resultMap.put("depList",userConDeps); + reultList.add(resultMap); + } + PageInfo>> resultPage = new PageInfo(reultList); + return resultPage; + } + + @Override + public void delete(Map map) { + userConDepMapper.deleteByUserId((Integer)map.get("userId")); + } + + @Override + public void save (Map map) { + String modifyPerson = "admin"; + UserTokenDto userToken= HttpRequestUtil.getUserToken(); + if(userToken!=null){ + modifyPerson=userToken.getUserInfo().getUserName(); + } + userConDepMapper.deleteByUserId((Integer)map.get("userId")); + for (String contractDepartmentId:(List)map.get("depList")){ + userConDepMapper.insert((Integer) map.get("userId"),contractDepartmentId,modifyPerson); + } + } +} -- Gitee From 9e7fab602a0441d8816a66202883371b16992fea Mon Sep 17 00:00:00 2001 From: ljc Date: Wed, 6 Jan 2021 14:52:56 +0800 Subject: [PATCH 203/211] =?UTF-8?q?=E7=94=A8=E6=88=B7-=E5=90=88=E5=90=8C?= =?UTF-8?q?=E9=83=A8=E9=97=A8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../line/controller/UserConDepController.java | 25 ++- .../com/soft/line/entity/UserPermission.java | 2 + .../soft/line/mapper/LasUserInfoMapper.xml | 6 +- .../soft/line/service/UserConDepService.java | 2 + .../line/service/impl/LoginServiceImpl.java | 145 +++++++++--------- .../service/impl/UserConDepServiceImpl.java | 9 ++ 6 files changed, 111 insertions(+), 78 deletions(-) diff --git a/src/main/java/com/soft/line/controller/UserConDepController.java b/src/main/java/com/soft/line/controller/UserConDepController.java index b5e2f8b..f3a2bf0 100644 --- a/src/main/java/com/soft/line/controller/UserConDepController.java +++ b/src/main/java/com/soft/line/controller/UserConDepController.java @@ -1,5 +1,6 @@ package com.soft.line.controller; +import com.soft.line.service.CodeDetailService; import com.soft.line.service.LasUserInfoService; import com.soft.line.service.UserConDepService; import com.soft.line.util.exception.CommonResult; @@ -22,6 +23,9 @@ public class UserConDepController { @Autowired private LasUserInfoService lasUserInfoService; + @Autowired + private CodeDetailService codeDetailService; + @PostMapping("/userConDeps") @ApiOperation(value = "获取所有用户合同部门") public CommonResult getAllMenus(@RequestBody Map map) { @@ -35,27 +39,38 @@ public class UserConDepController { return CommonResult.success("删除成功"); } - @PostMapping("/role") + @PostMapping("/userConDep") @ApiOperation(value = "保存用户合同部门") public CommonResult saveRole(@RequestBody Map map) { if (map.get("userId")==null||"".equals(map.get("userId"))) { return CommonResult.failed("用户名称不能为空"); }else{ - List depList = (List)map.get("depList"); + /*List depList = (List)map.get("depList"); Integer userId=(Integer) map.get("userId"); - // 归档登记员可以看全部合同部门； + // 管理员 或 归档登记员可以看全部合同部门； if (lasUserInfoService.isAssistantManager(userId)){ - + if (codeDetailService.selectByCodeType("101").size()!=depList.size()){ + return CommonResult.failed("管理员 或 归档登记员可以看全部合同部门"); + } }else if (lasUserInfoService.isDepManager(userId)){ // 总经理室的副总经理可以看两个合同部门； + if (depList.size()!=2){ + return CommonResult.failed("总经理室的副总经理可以看两个合同部门"); + } }else if (lasUserInfoService.isAssistantManager(userId)){ // 部门经理可以看当前部门 if (depList.size()!=1){ return CommonResult.failed("部门经理可以看当前部门"); } - } + }*/ userConDepService.save(map); return CommonResult.success("保存成功"); } } + + @PostMapping("/getConDepByUserId") + @ApiOperation(value = "获取所有用户合同部门") + public CommonResult getConDepByUserId(@RequestBody Map map) { + return CommonResult.success(userConDepService.getConDepByUserId(map)); + } } diff --git a/src/main/java/com/soft/line/entity/UserPermission.java b/src/main/java/com/soft/line/entity/UserPermission.java index 9e01bd8..5655852 100644 --- a/src/main/java/com/soft/line/entity/UserPermission.java +++ b/src/main/java/com/soft/line/entity/UserPermission.java @@ -32,4 +32,6 @@ public class UserPermission { private LasDepartmentInfo depInfo; private List> menuList; + + private List conDepList; } diff --git a/src/main/java/com/soft/line/mapper/LasUserInfoMapper.xml b/src/main/java/com/soft/line/mapper/LasUserInfoMapper.xml index e282bad..71dde3c 100644 --- a/src/main/java/com/soft/line/mapper/LasUserInfoMapper.xml +++ b/src/main/java/com/soft/line/mapper/LasUserInfoMapper.xml @@ -51,10 +51,10 @@ and u_info.user_status='Y' + \ No newline at end of file diff --git a/src/main/java/com/soft/line/service/impl/LasUserInfoServiceImpl.java b/src/main/java/com/soft/line/service/impl/LasUserInfoServiceImpl.java index 7392e96..d895c45 100644 --- a/src/main/java/com/soft/line/service/impl/LasUserInfoServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/LasUserInfoServiceImpl.java @@ -18,7 +18,7 @@ public class LasUserInfoServiceImpl implements LasUserInfoService { @Override public List selectUserInfoForConDep() { - return lasUserInfoMapper.selectUserForConDep(); + return lasUserInfoMapper.selectAllUsers(); } @Override -- Gitee From 9303c4abfc42186256c758fc9aa6ff14963c2424 Mon Sep 17 00:00:00 2001 From: ljc Date: Wed, 6 Jan 2021 16:22:41 +0800 Subject: [PATCH 205/211] =?UTF-8?q?=E7=94=A8=E6=88=B7-=E5=90=88=E5=90=8C?= =?UTF-8?q?=E9=83=A8=E9=97=A8=20=E6=98=BE=E7=A4=BA=E5=90=88=E5=90=8C?= =?UTF-8?q?=E9=83=A8=E9=97=A8=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/soft/line/entity/UserPermission.java | 2 +- .../com/soft/line/mapper/LasCodeItemMapper.java | 2 ++ .../java/com/soft/line/mapper/LasCodeItemMapper.xml | 7 +++++++ .../java/com/soft/line/mapper/UserConDepMapper.java | 3 ++- .../java/com/soft/line/mapper/UserConDepMapper.xml | 13 +++++++------ .../com/soft/line/service/UserConDepService.java | 3 ++- .../soft/line/service/impl/LoginServiceImpl.java | 4 +++- .../line/service/impl/UserConDepServiceImpl.java | 12 ++++++++---- 8 files changed, 32 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/soft/line/entity/UserPermission.java b/src/main/java/com/soft/line/entity/UserPermission.java index 5655852..b145312 100644 --- a/src/main/java/com/soft/line/entity/UserPermission.java +++ b/src/main/java/com/soft/line/entity/UserPermission.java @@ -33,5 +33,5 @@ public class UserPermission { private List> menuList; - private List conDepList; + private List conDepList; } diff --git a/src/main/java/com/soft/line/mapper/LasCodeItemMapper.java b/src/main/java/com/soft/line/mapper/LasCodeItemMapper.java index dcd196f..56ea709 100644 --- a/src/main/java/com/soft/line/mapper/LasCodeItemMapper.java +++ b/src/main/java/com/soft/line/mapper/LasCodeItemMapper.java @@ -23,6 +23,8 @@ public interface LasCodeItemMapper { */ List selectAll(); + List selectAllConDep(@Param("userId")Integer userId); + List selectByCodeType(@Param("itemTypeId") String itemTypeId); LasCodeItem selectByItemDesc(@Param("itemTypeId") String itemTypeId, @Param("itemDesc") String itemDesc); diff --git a/src/main/java/com/soft/line/mapper/LasCodeItemMapper.xml b/src/main/java/com/soft/line/mapper/LasCodeItemMapper.xml index b1fdb3a..64645c3 100644 --- a/src/main/java/com/soft/line/mapper/LasCodeItemMapper.xml +++ b/src/main/java/com/soft/line/mapper/LasCodeItemMapper.xml @@ -39,4 +39,11 @@ and `item_desc` = #{itemDesc} + + \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/UserConDepMapper.java b/src/main/java/com/soft/line/mapper/UserConDepMapper.java index a041ea6..37c951b 100644 --- a/src/main/java/com/soft/line/mapper/UserConDepMapper.java +++ b/src/main/java/com/soft/line/mapper/UserConDepMapper.java @@ -1,5 +1,6 @@ package com.soft.line.mapper; +import com.soft.line.entity.LasCodeItem; import com.soft.line.entity.LasUserInfo; import com.soft.line.entity.UserConDep; import org.apache.ibatis.annotations.Param; @@ -8,7 +9,7 @@ import java.util.List; public interface UserConDepMapper { - List selectAllUser(@Param("userName")String userName); + List selectAllUser(@Param("userId")Integer userId); List selectAllConDep(@Param("userId")Integer userId); diff --git a/src/main/java/com/soft/line/mapper/UserConDepMapper.xml b/src/main/java/com/soft/line/mapper/UserConDepMapper.xml index 78cc9b0..092ef4d 100644 --- a/src/main/java/com/soft/line/mapper/UserConDepMapper.xml +++ b/src/main/java/com/soft/line/mapper/UserConDepMapper.xml @@ -23,16 +23,17 @@ \ No newline at end of file diff --git a/src/main/java/com/soft/line/service/UserConDepService.java b/src/main/java/com/soft/line/service/UserConDepService.java index 6ed6465..ffe9740 100644 --- a/src/main/java/com/soft/line/service/UserConDepService.java +++ b/src/main/java/com/soft/line/service/UserConDepService.java @@ -1,6 +1,7 @@ package com.soft.line.service; import com.github.pagehelper.PageInfo; +import com.soft.line.entity.LasCodeItem; import java.util.List; import java.util.Map; @@ -9,7 +10,7 @@ public interface UserConDepService { PageInfo>> selectUserConDep(Map map); - List getConDepByUserId(Map map); + List getConDepByUserId(Map map); public void delete(Map map); diff --git a/src/main/java/com/soft/line/service/impl/LoginServiceImpl.java b/src/main/java/com/soft/line/service/impl/LoginServiceImpl.java index 643af2f..45ff56a 100644 --- a/src/main/java/com/soft/line/service/impl/LoginServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/LoginServiceImpl.java @@ -56,6 +56,8 @@ public class LoginServiceImpl implements LoginService { private ButtonInfoMapper buttonInfoMapper; @Autowired private UserConDepMapper userConDepMapper; + @Autowired + private LasCodeItemMapper lasCodeItemMapper; @Override public CommonResult userLogin(Map map) { @@ -284,7 +286,7 @@ public class LoginServiceImpl implements LoginService { userPermission.setDepInfo(supDep);*/ userPermission.setDepInfo(lasDepartmentInfoMapper.getDepByRole(userId)); //对应合同部门 - userPermission.setConDepList(userConDepMapper.selectAllConDep(userId)); + userPermission.setConDepList(lasCodeItemMapper.selectAllConDep(userId)); //获取对应角色 RoleInfo role = roleInfoMapper.selectByPrimaryKey(userInfo.getRoleId()); userPermission.setRole(role); diff --git a/src/main/java/com/soft/line/service/impl/UserConDepServiceImpl.java b/src/main/java/com/soft/line/service/impl/UserConDepServiceImpl.java index 74dff39..d88c93a 100644 --- a/src/main/java/com/soft/line/service/impl/UserConDepServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/UserConDepServiceImpl.java @@ -1,10 +1,12 @@ package com.soft.line.service.impl; import com.github.pagehelper.PageInfo; +import com.soft.line.entity.LasCodeItem; import com.soft.line.entity.LasUserInfo; import com.soft.line.entity.UserConDep; import com.soft.line.filter.HttpRequestUtil; import com.soft.line.filter.UserTokenDto; +import com.soft.line.mapper.LasCodeItemMapper; import com.soft.line.mapper.UserConDepMapper; import com.soft.line.service.UserConDepService; import com.soft.line.util.pagehelper.PageUtil; @@ -23,16 +25,18 @@ public class UserConDepServiceImpl implements UserConDepService { @Autowired public UserConDepMapper userConDepMapper; + @Autowired + public LasCodeItemMapper lasCodeItemMapper; @Override public PageInfo>> selectUserConDep(Map map) { PageUtil.setPageParam(map); List> reultList = new ArrayList>(); - for (LasUserInfo userInfo:userConDepMapper.selectAllUser((String)map.get("userName"))){ + for (LasUserInfo userInfo:userConDepMapper.selectAllUser((Integer) map.get("userId"))){ Map resultMap = new HashMap(); resultMap.put("userName",userInfo.getUserName()); resultMap.put("userId",userInfo.getId()); - List userConDeps=userConDepMapper.selectAllConDep(userInfo.getId()); + List userConDeps=lasCodeItemMapper.selectAllConDep(userInfo.getId()); resultMap.put("depList",userConDeps); reultList.add(resultMap); } @@ -41,8 +45,8 @@ public class UserConDepServiceImpl implements UserConDepService { } @Override - public List getConDepByUserId(Map map) { - return userConDepMapper.selectAllConDep((Integer) map.get("userId")); + public List getConDepByUserId(Map map) { + return lasCodeItemMapper.selectAllConDep((Integer) map.get("userId")); } @Override -- Gitee From cb22bb5ecfcb37d09dfbf95861ab214653791bb7 Mon Sep 17 00:00:00 2001 From: ljc Date: Wed, 6 Jan 2021 17:05:20 +0800 Subject: [PATCH 206/211] =?UTF-8?q?=E5=90=88=E5=90=8C=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=EF=BC=8C=E8=8E=B7=E5=8F=96=E7=94=A8=E6=88=B7=E5=90=88=E5=90=8C?= =?UTF-8?q?=E9=83=A8=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/StatisticsServiceImpl.java | 39 +++++-------------- 1 file changed, 9 insertions(+), 30 deletions(-) diff --git a/src/main/java/com/soft/line/service/impl/StatisticsServiceImpl.java b/src/main/java/com/soft/line/service/impl/StatisticsServiceImpl.java index 65a02b5..0536e4b 100644 --- a/src/main/java/com/soft/line/service/impl/StatisticsServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/StatisticsServiceImpl.java @@ -6,6 +6,7 @@ import com.soft.line.filter.UserTokenDto; import com.soft.line.mapper.CertificateInfoMapper; import com.soft.line.mapper.ContractInfoMapper; import com.soft.line.mapper.LasDepartmentInfoMapper; +import com.soft.line.mapper.UserConDepMapper; import com.soft.line.service.StatisticsService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -25,6 +26,8 @@ public class StatisticsServiceImpl implements StatisticsService { private CertificateInfoMapper certificateInfoMapper; @Autowired private LasDepartmentInfoMapper lasDepartmentInfoMapper; + @Autowired + private UserConDepMapper userConDepMapper; @Override public List> statisticsForCertificate(Map map) { @@ -88,17 +91,9 @@ public class StatisticsServiceImpl implements StatisticsService { List depIdList = new ArrayList(); UserTokenDto userToken= HttpRequestUtil.getUserToken(); if (userToken!=null){ - String roleName = userToken.getUserInfo().getRoleName(); - if (roleName.equals("管理员")||roleName.contains("归档登记员")){ - return contractInfoMapper.sumContractNatureByYearAndDep(map.get("year").toString(),depIdList); - }else if (roleName.equals("部门经理")){ - LasDepartmentInfo departmentInfo = lasDepartmentInfoMapper.getDepByRole(userToken.getUserInfo().getId()); - departmentInfo = getSupDep(departmentInfo.getId()); - depIdList.add(lasDepartmentInfoMapper.selectSuperiorDepByDepId(departmentInfo.getId()).getContractDepId()); - return contractInfoMapper.sumContractNatureByYearAndDep(map.get("year").toString(),depIdList); - }else{ - return null; - } + int userId = userToken.getUserInfo().getId(); + depIdList = userConDepMapper.selectAllConDep(userId); + return contractInfoMapper.sumContractNatureByYearAndDep(map.get("year").toString(),depIdList); }else{ return null; } @@ -110,29 +105,13 @@ public class StatisticsServiceImpl implements StatisticsService { List depIdList = new ArrayList(); UserTokenDto userToken= HttpRequestUtil.getUserToken(); if (userToken!=null){ - String roleName = userToken.getUserInfo().getRoleName(); - if (roleName.equals("管理员")||roleName.contains("归档登记员")){ - return contractInfoMapper.countNumGroupByDep(depIdList); - }else if (roleName.equals("部门经理")){ - LasDepartmentInfo departmentInfo = lasDepartmentInfoMapper.getDepByRole(userToken.getUserInfo().getId()); - departmentInfo = getSupDep(departmentInfo.getId()); - depIdList.add(lasDepartmentInfoMapper.selectSuperiorDepByDepId(departmentInfo.getId()).getContractDepId()); - return contractInfoMapper.countNumGroupByDep(depIdList); - }else{ - return null; - } + int userId = userToken.getUserInfo().getId(); + depIdList = userConDepMapper.selectAllConDep(userId); + return contractInfoMapper.countNumGroupByDep(depIdList); }else{ return null; } } - public LasDepartmentInfo getSupDep(String depId) { - LasDepartmentInfo lasDepartmentInfo = lasDepartmentInfoMapper.selectSupDepByDepId(depId); - while (lasDepartmentInfo!=null && !lasDepartmentInfo.getSuperiorDepId().equals("0")){ - lasDepartmentInfo = getSupDep(lasDepartmentInfo.getId()); - } - lasDepartmentInfo = lasDepartmentInfoMapper.selectSuperiorDepByDepId(depId); - return lasDepartmentInfo; - } } -- Gitee From 803d3611e0b65e3200c417d3d3925e5f6998df4c Mon Sep 17 00:00:00 2001 From: ljc <1119265069@qq.com> Date: Sat, 9 Jan 2021 22:00:04 +0800 Subject: [PATCH 207/211] =?UTF-8?q?=E5=90=88=E5=90=8C=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E9=83=A8=E9=97=A8=E5=85=B3=E8=81=94=E7=94=A8=E6=88=B7=E5=90=88?= =?UTF-8?q?=E5=90=8C=E9=83=A8=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AppletContractController.java | 15 ++++++ .../line/mapper/AppletContractMapper.java | 7 +++ .../soft/line/mapper/AppletContractMapper.xml | 8 +++ .../soft/line/mapper/ContractInfoMapper.xml | 7 +++ .../line/service/AppletContractService.java | 7 +++ .../impl/AppletContractServiceImpl.java | 6 +++ .../service/impl/ContractInfoServiceImpl.java | 54 +++++++++++++------ 7 files changed, 87 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/soft/line/controller/AppletContractController.java b/src/main/java/com/soft/line/controller/AppletContractController.java index d49a6f5..3898372 100644 --- a/src/main/java/com/soft/line/controller/AppletContractController.java +++ b/src/main/java/com/soft/line/controller/AppletContractController.java @@ -165,5 +165,20 @@ public class AppletContractController { return appletContractService.deleteContract(paraMap); } + /** + * 小程序使用 + * 获取用户的合同部门 + * + * @param paraMap 参数 + * @return + */ + @PostMapping("/getUserContDep") + public AjaxResult getUserContDep(@RequestBody Map paraMap) { + if(paraMap.get("userId") == null){ + return AjaxResult.error("没有用户ID"); + } + + return appletContractService.getUserContDep(paraMap); + } } diff --git a/src/main/java/com/soft/line/mapper/AppletContractMapper.java b/src/main/java/com/soft/line/mapper/AppletContractMapper.java index c9f714c..d67a344 100644 --- a/src/main/java/com/soft/line/mapper/AppletContractMapper.java +++ b/src/main/java/com/soft/line/mapper/AppletContractMapper.java @@ -146,4 +146,11 @@ public interface AppletContractMapper { * 通过ID查询相关合同 */ List> getAboutAllContractsByIdList(Map paraMap); + + /** + * 获取用户的合同部门 + * + * @return + */ + List> getUserContDep(@Param("userId") int userId); } diff --git a/src/main/java/com/soft/line/mapper/AppletContractMapper.xml b/src/main/java/com/soft/line/mapper/AppletContractMapper.xml index c4928e5..53cbc27 100644 --- a/src/main/java/com/soft/line/mapper/AppletContractMapper.xml +++ b/src/main/java/com/soft/line/mapper/AppletContractMapper.xml @@ -331,4 +331,12 @@ limit #{pageNum}, #{dataNum} + + \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml b/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml index 9f10154..3a7b22b 100644 --- a/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml +++ b/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml @@ -106,6 +106,13 @@ AND instr(dep_id,#{depId,jdbcType=DECIMAL})>0 + + and `dep_id` in + + #{depId} + + ) + AND instr(contract_name,#{contractName,jdbcType=VARCHAR})>0 diff --git a/src/main/java/com/soft/line/service/AppletContractService.java b/src/main/java/com/soft/line/service/AppletContractService.java index a5ffbc1..f4eed9c 100644 --- a/src/main/java/com/soft/line/service/AppletContractService.java +++ b/src/main/java/com/soft/line/service/AppletContractService.java @@ -87,4 +87,11 @@ public interface AppletContractService { AjaxResult deleteContract(Map paraMap); + /** + * 获取用户的合同部门 + * + * @param paraMap 参数 + * @return + */ + AjaxResult getUserContDep(Map paraMap); } diff --git a/src/main/java/com/soft/line/service/impl/AppletContractServiceImpl.java b/src/main/java/com/soft/line/service/impl/AppletContractServiceImpl.java index 1ef3212..3c8b0fb 100644 --- a/src/main/java/com/soft/line/service/impl/AppletContractServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/AppletContractServiceImpl.java @@ -327,6 +327,12 @@ public class AppletContractServiceImpl implements AppletContractService { } } + @Override + public AjaxResult getUserContDep(Map paraMap) { + List> list = appletContractMapper.getUserContDep((Integer) paraMap.get("userId")); + return AjaxResult.success(list); + } + /** * 自定义时间格式 * diff --git a/src/main/java/com/soft/line/service/impl/ContractInfoServiceImpl.java b/src/main/java/com/soft/line/service/impl/ContractInfoServiceImpl.java index 6b9b043..827219c 100644 --- a/src/main/java/com/soft/line/service/impl/ContractInfoServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/ContractInfoServiceImpl.java @@ -7,6 +7,7 @@ import com.soft.line.filter.HttpRequestUtil; import com.soft.line.filter.UserTokenDto; import com.soft.line.mapper.AttachmentInfoMapper; import com.soft.line.mapper.ContractInfoMapper; +import com.soft.line.mapper.UserConDepMapper; import com.soft.line.service.ContractInfoService; import com.soft.line.util.pagehelper.PageUtil; import io.swagger.models.auth.In; @@ -25,17 +26,19 @@ import java.util.Map; */ @Service @Slf4j -public class ContractInfoServiceImpl implements ContractInfoService{ +public class ContractInfoServiceImpl implements ContractInfoService { @Autowired private ContractInfoMapper contractInfoMapper; @Autowired private AttachmentInfoMapper attachmentInfoMapper; + @Autowired + private UserConDepMapper userConDepMapper; @Override public PageInfo getAllAboutContracts(Map map) { PageUtil.setPageParam(map); - List contractInfos=contractInfoMapper.getAllAboutContracts(map); + List contractInfos = contractInfoMapper.getAllAboutContracts(map); PageInfo beans = new PageInfo(contractInfos); beans.setList(contractInfos); return beans; @@ -45,6 +48,22 @@ public class ContractInfoServiceImpl implements ContractInfoService{ public PageInfo getAllContracts(Map map) { //PageUtil.setPageParam(map); List conResults = new ArrayList(); + List depList = new ArrayList(); + if (map.get("depId").toString().length() > 0) { + depList.add(map.get("depId").toString()); + } else { + Integer userId = null; + UserTokenDto userToken = HttpRequestUtil.getUserToken(); + if (userToken != null) { + userId = userToken.getUserInfo().getId(); + } + depList = userConDepMapper.selectAllConDep(userId); + if (depList.size() == 0) { + PageInfo beans = new PageInfo(conResults); + beans.setList(conResults); + return beans; + } + } //根据查询条件查询数据 List constracts1 = contractInfoMapper.selectAll(map); if (constracts1.size() == 0) { @@ -63,6 +82,7 @@ public class ContractInfoServiceImpl implements ContractInfoService{ PageUtil.setPageParam(map); conResults = contractInfoMapper.getAllByIdList(map); } + PageInfo beans = new PageInfo(conResults); beans.setList(conResults); return beans; @@ -71,15 +91,15 @@ public class ContractInfoServiceImpl implements ContractInfoService{ @Override public void delete(Map map) { contractInfoMapper.delete(map); - attachmentInfoMapper.delete("1",(Integer)map.get("id")); + attachmentInfoMapper.delete("1", (Integer) map.get("id")); } @Override public void add(ContractInfo contractInfo) { - String userName="admin"; - UserTokenDto userToken= HttpRequestUtil.getUserToken(); - if(userToken!=null){ - userName=userToken.getUserInfo().getUserName(); + String userName = "admin"; + UserTokenDto userToken = HttpRequestUtil.getUserToken(); + if (userToken != null) { + userName = userToken.getUserInfo().getUserName(); } contractInfo.setModifyPerson(userName); contractInfoMapper.insert(contractInfo); @@ -87,10 +107,10 @@ public class ContractInfoServiceImpl implements ContractInfoService{ @Override public void update(ContractInfo contractInfo) { - String userName="admin"; - UserTokenDto userToken= HttpRequestUtil.getUserToken(); - if(userToken!=null){ - userName=userToken.getUserInfo().getUserName(); + String userName = "admin"; + UserTokenDto userToken = HttpRequestUtil.getUserToken(); + if (userToken != null) { + userName = userToken.getUserInfo().getUserName(); } contractInfo.setModifyPerson(userName); contractInfo.setModifyTime(new Date()); @@ -99,12 +119,12 @@ public class ContractInfoServiceImpl implements ContractInfoService{ @Override public void insertList(List list) { - String userName="admin"; - UserTokenDto userToken= HttpRequestUtil.getUserToken(); - if(userToken!=null){ - userName=userToken.getUserInfo().getUserName(); + String userName = "admin"; + UserTokenDto userToken = HttpRequestUtil.getUserToken(); + if (userToken != null) { + userName = userToken.getUserInfo().getUserName(); } - for (ContractInfo record:list){ + for (ContractInfo record : list) { record.setModifyPerson(userName); record.setModifyTime(new Date()); contractInfoMapper.insertRecord(record); @@ -118,6 +138,6 @@ public class ContractInfoServiceImpl implements ContractInfoService{ @Override public List getAllCNByIDList(Map map) { - return contractInfoMapper.getAllCNByIdList((List)map.get("ids")); + return contractInfoMapper.getAllCNByIdList((List) map.get("ids")); } } -- Gitee From ad6bf51487ca58d87fb645747c54655542232e87 Mon Sep 17 00:00:00 2001 From: ljc Date: Mon, 11 Jan 2021 15:53:43 +0800 Subject: [PATCH 208/211] =?UTF-8?q?=E5=90=88=E5=90=8C=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=EF=BC=8C=E8=8E=B7=E5=8F=96=E7=94=A8=E6=88=B7=E5=90=88=E5=90=8C?= =?UTF-8?q?=E9=83=A8=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/soft/line/service/impl/ContractInfoServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/soft/line/service/impl/ContractInfoServiceImpl.java b/src/main/java/com/soft/line/service/impl/ContractInfoServiceImpl.java index 827219c..cb78a5b 100644 --- a/src/main/java/com/soft/line/service/impl/ContractInfoServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/ContractInfoServiceImpl.java @@ -49,7 +49,7 @@ public class ContractInfoServiceImpl implements ContractInfoService { //PageUtil.setPageParam(map); List conResults = new ArrayList(); List depList = new ArrayList(); - if (map.get("depId").toString().length() > 0) { + if (map.get("depId")!=null && map.get("depId").toString().length() > 0) { depList.add(map.get("depId").toString()); } else { Integer userId = null; -- Gitee From a1e564986fb4f6e924efc0fcc3fc9a9995edcb7f Mon Sep 17 00:00:00 2001 From: ljc Date: Mon, 11 Jan 2021 16:27:32 +0800 Subject: [PATCH 209/211] =?UTF-8?q?=E5=90=88=E5=90=8C=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=EF=BC=8C=E6=9F=A5=E8=AF=A2=E7=94=A8=E6=88=B7=E5=90=88=E5=90=8C?= =?UTF-8?q?=E9=83=A8=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/soft/line/mapper/ContractInfoMapper.xml | 4 ---- .../com/soft/line/service/impl/ContractInfoServiceImpl.java | 1 + 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml b/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml index 3a7b22b..9f3eebf 100644 --- a/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml +++ b/src/main/java/com/soft/line/mapper/ContractInfoMapper.xml @@ -103,15 +103,11 @@ `modify_person`,`modify_time`, `del_flg`,`contract_nature`,`contract_content` from `contract_info` where del_flg = '0' - - AND instr(dep_id,#{depId,jdbcType=DECIMAL})>0 - and `dep_id` in #{depId} - ) AND instr(contract_name,#{contractName,jdbcType=VARCHAR})>0 diff --git a/src/main/java/com/soft/line/service/impl/ContractInfoServiceImpl.java b/src/main/java/com/soft/line/service/impl/ContractInfoServiceImpl.java index cb78a5b..e4b12ca 100644 --- a/src/main/java/com/soft/line/service/impl/ContractInfoServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/ContractInfoServiceImpl.java @@ -64,6 +64,7 @@ public class ContractInfoServiceImpl implements ContractInfoService { return beans; } } + map.put("depList",depList); //根据查询条件查询数据 List constracts1 = contractInfoMapper.selectAll(map); if (constracts1.size() == 0) { -- Gitee From 1a702afbb000b40ac5b547d9b3ab8579ceb89228 Mon Sep 17 00:00:00 2001 From: ljc Date: Thu, 21 Jan 2021 16:25:35 +0800 Subject: [PATCH 210/211] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=90=88=E5=90=8C?= =?UTF-8?q?=E9=83=A8=E9=97=A8=E6=9F=A5=E8=AF=A2=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../line/controller/UserConDepController.java | 33 +++++++------------ .../java/com/soft/line/entity/UserConDep.java | 7 ++++ .../soft/line/mapper/UserConDepMapper.java | 7 ++-- .../com/soft/line/mapper/UserConDepMapper.xml | 23 ++++++++----- .../soft/line/service/UserConDepService.java | 6 +++- .../service/impl/UserConDepServiceImpl.java | 23 +++++++------ 6 files changed, 54 insertions(+), 45 deletions(-) diff --git a/src/main/java/com/soft/line/controller/UserConDepController.java b/src/main/java/com/soft/line/controller/UserConDepController.java index f3a2bf0..b3a7955 100644 --- a/src/main/java/com/soft/line/controller/UserConDepController.java +++ b/src/main/java/com/soft/line/controller/UserConDepController.java @@ -43,29 +43,18 @@ public class UserConDepController { @ApiOperation(value = "保存用户合同部门") public CommonResult saveRole(@RequestBody Map map) { if (map.get("userId")==null||"".equals(map.get("userId"))) { - return CommonResult.failed("用户名称不能为空"); - }else{ - /*List depList = (List)map.get("depList"); - Integer userId=(Integer) map.get("userId"); - // 管理员 或 归档登记员可以看全部合同部门； - if (lasUserInfoService.isAssistantManager(userId)){ - if (codeDetailService.selectByCodeType("101").size()!=depList.size()){ - return CommonResult.failed("管理员 或 归档登记员可以看全部合同部门"); - } - }else if (lasUserInfoService.isDepManager(userId)){ - // 总经理室的副总经理可以看两个合同部门； - if (depList.size()!=2){ - return CommonResult.failed("总经理室的副总经理可以看两个合同部门"); - } - }else if (lasUserInfoService.isAssistantManager(userId)){ - // 部门经理可以看当前部门 - if (depList.size()!=1){ - return CommonResult.failed("部门经理可以看当前部门"); - } - }*/ - userConDepService.save(map); - return CommonResult.success("保存成功"); + return CommonResult.failed("用户名称不能为空!"); } + // id为空，新增 + if (map.get("id")==null||"".equals(map.get("id"))){ + //新增时判断是否有数据，有则提示并不能新增 + if (userConDepService.exitsUserConDep(map)){ + return CommonResult.failed("该用户已存在配置记录，不能新增!"); + } + } + userConDepService.save(map); + return CommonResult.success("保存成功"); + } @PostMapping("/getConDepByUserId") diff --git a/src/main/java/com/soft/line/entity/UserConDep.java b/src/main/java/com/soft/line/entity/UserConDep.java index 8b965ae..4de8ff9 100644 --- a/src/main/java/com/soft/line/entity/UserConDep.java +++ b/src/main/java/com/soft/line/entity/UserConDep.java @@ -9,6 +9,7 @@ import org.hibernate.validator.constraints.Length; import javax.validation.constraints.NotNull; import java.util.Date; +import java.util.List; @Data @NoArgsConstructor @@ -20,6 +21,9 @@ public class UserConDep { @ApiModelProperty(value = "用户ID") private Integer userId; + @ApiModelProperty(value = "用户ID") + private String userName; + @ApiModelProperty(value = "合同部门id(item_type_id=101)") private String contractDepartmentId; @@ -29,4 +33,7 @@ public class UserConDep { @ApiModelProperty(value = "修改时间") @JsonFormat(pattern = "yyyy-MM-dd",timezone = "Asia/Shanghai") private Date modifyTime; + + @ApiModelProperty(value = "合同部门") + private List depList; } \ No newline at end of file diff --git a/src/main/java/com/soft/line/mapper/UserConDepMapper.java b/src/main/java/com/soft/line/mapper/UserConDepMapper.java index 37c951b..e5bb3dd 100644 --- a/src/main/java/com/soft/line/mapper/UserConDepMapper.java +++ b/src/main/java/com/soft/line/mapper/UserConDepMapper.java @@ -1,7 +1,6 @@ package com.soft.line.mapper; -import com.soft.line.entity.LasCodeItem; -import com.soft.line.entity.LasUserInfo; + import com.soft.line.entity.UserConDep; import org.apache.ibatis.annotations.Param; @@ -9,10 +8,12 @@ import java.util.List; public interface UserConDepMapper { - List selectAllUser(@Param("userId")Integer userId); + List selectAllUser(@Param("userId")Integer userId); List selectAllConDep(@Param("userId")Integer userId); + int countUserConDepByUserId(@Param("userId")Integer userId); + int insert(@Param("userId")Integer userId, @Param("contractDepartmentId") String contractDepartmentId,@Param("modifyPerson") String modifyPerson); int deleteByUserId(Integer userId); diff --git a/src/main/java/com/soft/line/mapper/UserConDepMapper.xml b/src/main/java/com/soft/line/mapper/UserConDepMapper.xml index 092ef4d..d288319 100644 --- a/src/main/java/com/soft/line/mapper/UserConDepMapper.xml +++ b/src/main/java/com/soft/line/mapper/UserConDepMapper.xml @@ -2,12 +2,9 @@ - + @@ -22,13 +19,17 @@ delete from user_contractdepartment where user_id = #{userId} - + select max(t.id) id, + t.user_id , + (SELECT e.username from las_employee e where e.id = (select u.employee_id from las_user_info u WHERE u.id=t.user_id)) user_name + from user_contractdepartment t + where 1=1 - and u_info.id = #{userId} + and t.user_id = #{userId} + group by user_id + + + \ No newline at end of file diff --git a/src/main/java/com/soft/line/service/UserConDepService.java b/src/main/java/com/soft/line/service/UserConDepService.java index ffe9740..243c838 100644 --- a/src/main/java/com/soft/line/service/UserConDepService.java +++ b/src/main/java/com/soft/line/service/UserConDepService.java @@ -2,16 +2,20 @@ package com.soft.line.service; import com.github.pagehelper.PageInfo; import com.soft.line.entity.LasCodeItem; +import com.soft.line.entity.LasUserInfo; +import com.soft.line.entity.UserConDep; import java.util.List; import java.util.Map; public interface UserConDepService { - PageInfo>> selectUserConDep(Map map); + PageInfo selectUserConDep(Map map); List getConDepByUserId(Map map); + public boolean exitsUserConDep(Map map); + public void delete(Map map); public void save(Map map); diff --git a/src/main/java/com/soft/line/service/impl/UserConDepServiceImpl.java b/src/main/java/com/soft/line/service/impl/UserConDepServiceImpl.java index d88c93a..71d67b6 100644 --- a/src/main/java/com/soft/line/service/impl/UserConDepServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/UserConDepServiceImpl.java @@ -29,18 +29,15 @@ public class UserConDepServiceImpl implements UserConDepService { public LasCodeItemMapper lasCodeItemMapper; @Override - public PageInfo>> selectUserConDep(Map map) { + public PageInfo selectUserConDep(Map map) { PageUtil.setPageParam(map); - List> reultList = new ArrayList>(); - for (LasUserInfo userInfo:userConDepMapper.selectAllUser((Integer) map.get("userId"))){ - Map resultMap = new HashMap(); - resultMap.put("userName",userInfo.getUserName()); - resultMap.put("userId",userInfo.getId()); - List userConDeps=lasCodeItemMapper.selectAllConDep(userInfo.getId()); - resultMap.put("depList",userConDeps); - reultList.add(resultMap); + List ucpList =userConDepMapper.selectAllUser((Integer) map.get("userId")); + for (UserConDep ucp:ucpList){ + List userConDeps=lasCodeItemMapper.selectAllConDep(ucp.getUserId()); + ucp.setDepList(userConDeps); } - PageInfo>> resultPage = new PageInfo(reultList); + PageInfo resultPage = new PageInfo(ucpList); + resultPage.setList(ucpList); return resultPage; } @@ -49,6 +46,12 @@ public class UserConDepServiceImpl implements UserConDepService { return lasCodeItemMapper.selectAllConDep((Integer) map.get("userId")); } + @Override + public boolean exitsUserConDep(Map map) { + int count = userConDepMapper.countUserConDepByUserId((Integer) map.get("userId")); + return count==0; + } + @Override public void delete(Map map) { userConDepMapper.deleteByUserId((Integer)map.get("userId")); -- Gitee From 36ed7c6290498b88578121829067ff4d89b8df91 Mon Sep 17 00:00:00 2001 From: ljc Date: Thu, 21 Jan 2021 16:45:49 +0800 Subject: [PATCH 211/211] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=90=88=E5=90=8C?= =?UTF-8?q?=E9=83=A8=E9=97=A8=20=E6=96=B0=E5=A2=9E=E6=97=B6=E5=88=A4?= =?UTF-8?q?=E6=96=AD=E6=98=AF=E5=90=A6=E6=9C=89=E7=94=A8=E6=88=B7=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/soft/line/service/impl/UserConDepServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/soft/line/service/impl/UserConDepServiceImpl.java b/src/main/java/com/soft/line/service/impl/UserConDepServiceImpl.java index 71d67b6..b214a32 100644 --- a/src/main/java/com/soft/line/service/impl/UserConDepServiceImpl.java +++ b/src/main/java/com/soft/line/service/impl/UserConDepServiceImpl.java @@ -49,7 +49,7 @@ public class UserConDepServiceImpl implements UserConDepService { @Override public boolean exitsUserConDep(Map map) { int count = userConDepMapper.countUserConDepByUserId((Integer) map.get("userId")); - return count==0; + return count>0; } @Override -- Gitee