diff --git b/mvnw a/mvnw new file mode 100755 index 0000000..5bf251c --- /dev/null +++ a/mvnw @@ -0,0 +1,225 @@ +#!/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 +# +# 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. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Maven2 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 Migwn, 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)`" + # TODO classpath? +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 + +export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} +echo $MAVEN_PROJECTBASEDIR +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 + +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 b/mvnw.cmd a/mvnw.cmd new file mode 100644 index 0000000..019bd74 --- /dev/null +++ a/mvnw.cmd @@ -0,0 +1,143 @@ +@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 http://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 Maven2 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 key stroke 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 enable echoing my 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 + +%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 b/pom.xml a/pom.xml new file mode 100644 index 0000000..ca3a4a7 --- /dev/null +++ a/pom.xml @@ -0,0 +1,127 @@ + + + 4.0.0 + + com.zteits.oa + zteits-oa + 0.0.1-SNAPSHOT + jar + + zteits_daily_report + Demo project for Spring Boot + + + org.springframework.boot + spring-boot-starter-parent + 1.5.2.RELEASE + + + + + UTF-8 + UTF-8 + 1.8 + 1.3.1.RELEASE + 5.1.21 + 3.0.5 + 3.4.4 + 1.0.29 + 1.1.0 + + + + + org.springframework.boot + spring-boot-starter + + + org.springframework.boot + spring-boot-starter-test + test + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-aop + + + org.springframework.boot + spring-boot-starter-redis + 1.4.7.RELEASE + + + + org.springframework.session + spring-session + + + + org.mybatis.generator + mybatis-generator-core + 1.3.5 + + + + mysql + mysql-connector-java + ${mysql-connector-java.version} + runtime + + + + com.xiaoleilu + hutool-all + ${hutool-all.version} + + + + org.mybatis + mybatis + ${org.mybatis.version} + + + com.github.pagehelper + pagehelper-spring-boot-starter + ${pagehelper-spring-boot-starter.version} + + + com.alibaba + druid + ${com.alibaba.version} + + + com.alibaba + fastjson + 1.2.47 + + + + + + + + com.zteits.oa + + + org.springframework.boot + spring-boot-maven-plugin + + com.daily.report.DailyReportApplication + + 1.3.5.RELEASE + + + org.apache.maven.plugins + maven-assembly-plugin + + + + + + + + diff --git b/src/main/java/com/zteits/oa/DailyReportApplication.java a/src/main/java/com/zteits/oa/DailyReportApplication.java new file mode 100644 index 0000000..50027ea --- /dev/null +++ a/src/main/java/com/zteits/oa/DailyReportApplication.java @@ -0,0 +1,21 @@ +package com.zteits.oa; + +import org.mybatis.spring.annotation.MapperScan; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; +import org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration; + +@SpringBootApplication +@EnableAutoConfiguration(exclude = { + DataSourceAutoConfiguration.class, + DataSourceTransactionManagerAutoConfiguration.class + }) +@MapperScan("com.zteits.oa.report.mapper") +public class DailyReportApplication { + + public static void main(String[] args) { + SpringApplication.run(DailyReportApplication.class, args); + } +} diff --git b/src/main/java/com/zteits/oa/configuration/druid/DruidAutoConfiguration.java a/src/main/java/com/zteits/oa/configuration/druid/DruidAutoConfiguration.java new file mode 100644 index 0000000..3016cfc --- /dev/null +++ a/src/main/java/com/zteits/oa/configuration/druid/DruidAutoConfiguration.java @@ -0,0 +1,120 @@ +package com.zteits.oa.configuration.druid; + +import java.sql.SQLException; + +import javax.sql.DataSource; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.autoconfigure.AutoConfigureBefore; +import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; +import org.springframework.boot.context.properties.EnableConfigurationProperties; +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 org.springframework.util.StringUtils; + +import com.alibaba.druid.pool.DruidDataSource; +import com.alibaba.druid.support.http.StatViewServlet; +import com.alibaba.druid.support.http.WebStatFilter; + +/** + * + * + * Copyright: Copyright (c) 2017 zteits + * + * @ClassName: DruidAutoConfiguration.java + * @Description: + * @version: v1.0.0 + * @author: liuzl + * @date: 2017年4月19日 下午7:52:52 + * Modification History: + * Date Author Version Description + *---------------------------------------------------------* + * 2017年4月19日 liuzl v1.0.0 创建 + */ +@Configuration + +@EnableConfigurationProperties(DruidProperties.class) +@ConditionalOnClass(DruidDataSource.class) +@ConditionalOnProperty(prefix = "druid", name = "url") +@AutoConfigureBefore(DataSourceAutoConfiguration.class) +public class DruidAutoConfiguration { + + @Autowired + private DruidProperties properties; + + @Bean + public DataSource dataSource() throws SQLException { + DruidDataSource dataSource = new DruidDataSource(); + dataSource.setUrl(properties.getUrl()); + dataSource.setUsername(properties.getUsername()); + dataSource.setPassword(properties.getPassword()); + if (properties.getInitialSize() > 0) { + dataSource.setInitialSize(properties.getInitialSize()); + } + if (properties.getMinIdle() > 0) { + dataSource.setMinIdle(properties.getMinIdle()); + } + if (properties.getMaxActive() > 0) { + dataSource.setMaxActive(properties.getMaxActive()); + } + if(!StringUtils.isEmpty(properties.getFilters())){ + dataSource.setFilters(properties.getFilters()); + } + if(!StringUtils.isEmpty(properties.getValidationQuery())){ + dataSource.setValidationQuery(properties.getValidationQuery()); + } + if(properties.getTimeBetweenEvictionRunsMillis() > 0){ + dataSource.setTimeBetweenEvictionRunsMillis(properties.getTimeBetweenEvictionRunsMillis()); + } + if(properties.getMinEvictableIdleTimeMillis() > 0){ + dataSource.setMinEvictableIdleTimeMillis(properties.getMinEvictableIdleTimeMillis()); + } + if(properties.getMaxWait() > 0){ + dataSource.setMaxWait(properties.getMaxWait()); + } + dataSource.setTestOnBorrow(properties.isTestOnBorrow()); + dataSource.setTestOnReturn(properties.isTestOnReturn()); + dataSource.setTestWhileIdle(properties.isTestOnWhileIdle()); + + try { + dataSource.init(); + } catch (SQLException e) { + throw new RuntimeException(e); + } + return dataSource; + } + + @Bean + public ServletRegistrationBean DruidStatViewServle() { + //org.springframework.boot.context.embedded.ServletRegistrationBean提供类的进行注册. + ServletRegistrationBean servletRegistrationBean = new ServletRegistrationBean(new StatViewServlet(), "/druid/*"); + //添加初始化参数：initParams + + //白名单： + //servletRegistrationBean.addInitParameter("allow","192.168.1.106"); + //IP黑名单 (存在共同时，deny优先于allow) : 如果满足deny的话提示:Sorry, you are not permitted to view this page. + // servletRegistrationBean.addInitParameter("deny", "192.168.1.73"); + //登录查看信息的账号密码. + servletRegistrationBean.addInitParameter("loginUsername","admin"); + servletRegistrationBean.addInitParameter("loginPassword","123456"); + //是否能够重置数据. + servletRegistrationBean.addInitParameter("resetEnable","false"); + return servletRegistrationBean; + } + + + @Bean + public FilterRegistrationBean druidStatFilter(){ + FilterRegistrationBean filterRegistrationBean = new FilterRegistrationBean(new WebStatFilter()); + //添加过滤规则. + filterRegistrationBean.addUrlPatterns("/*"); + //添加不需要忽略的格式信息. + filterRegistrationBean.addInitParameter("exclusions","*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*"); + return filterRegistrationBean; + } + +} diff --git b/src/main/java/com/zteits/oa/configuration/druid/DruidProperties.java a/src/main/java/com/zteits/oa/configuration/druid/DruidProperties.java new file mode 100644 index 0000000..048881e --- /dev/null +++ a/src/main/java/com/zteits/oa/configuration/druid/DruidProperties.java @@ -0,0 +1,158 @@ +package com.zteits.oa.configuration.druid; + +import org.springframework.boot.context.properties.ConfigurationProperties; + +/** + * + * + * Copyright: Copyright (c) 2017 zteits + * + * @ClassName: DruidProperties.java + * @Description: + * @version: v1.0.0 + * @author: liuzl + * @date: 2017年4月19日 下午7:44:44 Modification History: Date Author Version + * Description ---------------------------------------------------------* + * 2017年4月19日 liuzl v1.0.0 创建 + */ +@ConfigurationProperties(prefix = "druid") +public class DruidProperties { + + private String url; + private String username; + private String password; + private String driverClass; + + private String filters; + private String validationQuery; + private int maxActive; + private int minIdle; + private int initialSize; + private int minEvictableIdleTimeMillis; + private int timeBetweenEvictionRunsMillis; + private int maxWait; + private boolean testOnBorrow; + private boolean testOnReturn; + private boolean testOnWhileIdle; + + public String getUrl() { + return url; + } + + public void setUrl(String url) { + this.url = url; + } + + 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 getDriverClass() { + return driverClass; + } + + public void setDriverClass(String driverClass) { + this.driverClass = driverClass; + } + + public int getMaxActive() { + return maxActive; + } + + public void setMaxActive(int maxActive) { + this.maxActive = maxActive; + } + + public int getMinIdle() { + return minIdle; + } + + public void setMinIdle(int minIdle) { + this.minIdle = minIdle; + } + + public int getInitialSize() { + return initialSize; + } + + public void setInitialSize(int initialSize) { + this.initialSize = initialSize; + } + + public boolean isTestOnBorrow() { + return testOnBorrow; + } + + public void setTestOnBorrow(boolean testOnBorrow) { + this.testOnBorrow = testOnBorrow; + } + + public boolean isTestOnReturn() { + return testOnReturn; + } + + public void setTestOnReturn(boolean testOnReturn) { + this.testOnReturn = testOnReturn; + } + + public boolean isTestOnWhileIdle() { + return testOnWhileIdle; + } + + public void setTestOnWhileIdle(boolean testOnWhileIdle) { + this.testOnWhileIdle = testOnWhileIdle; + } + + public String getValidationQuery() { + return validationQuery; + } + + public void setValidationQuery(String validationQuery) { + this.validationQuery = validationQuery; + } + + public int getMinEvictableIdleTimeMillis() { + return minEvictableIdleTimeMillis; + } + + public void setMinEvictableIdleTimeMillis(int minEvictableIdleTimeMillis) { + this.minEvictableIdleTimeMillis = minEvictableIdleTimeMillis; + } + + public int getTimeBetweenEvictionRunsMillis() { + return timeBetweenEvictionRunsMillis; + } + + public void setTimeBetweenEvictionRunsMillis(int timeBetweenEvictionRunsMillis) { + this.timeBetweenEvictionRunsMillis = timeBetweenEvictionRunsMillis; + } + + public int getMaxWait() { + return maxWait; + } + + public void setMaxWait(int maxWait) { + this.maxWait = maxWait; + } + + public String getFilters() { + return filters; + } + + public void setFilters(String filters) { + this.filters = filters; + } + +} diff --git b/src/main/java/com/zteits/oa/configuration/session/HttpSessionConfig.java a/src/main/java/com/zteits/oa/configuration/session/HttpSessionConfig.java new file mode 100644 index 0000000..38f3d10 --- /dev/null +++ a/src/main/java/com/zteits/oa/configuration/session/HttpSessionConfig.java @@ -0,0 +1,30 @@ +package com.zteits.oa.configuration.session; + +import org.springframework.context.annotation.Bean; +import org.springframework.session.data.redis.config.annotation.web.http.EnableRedisHttpSession; +import org.springframework.session.web.http.HeaderHttpSessionStrategy; +import org.springframework.session.web.http.HttpSessionStrategy; + +/** + * Copyright: Copyright (c) 2017 zteits + * + * @ClassName: com.zteits.oauth.portal.config.session + * @Description: + * @version: v1.0.0 + * @author: atao + * @date: 2017/5/16 下午9:23 + * Modification History: + * Date Author Version Description + * ---------------------------------------------------------* + * 2017/5/16 atao v1.0.0 创建 + */ +//maxInactiveIntervalInSeconds +@EnableRedisHttpSession(maxInactiveIntervalInSeconds=30*24*60*60) +public class HttpSessionConfig { + + @Bean + public HttpSessionStrategy httpSessionStrategy() { + return new HeaderHttpSessionStrategy(); + } + +} diff --git b/src/main/java/com/zteits/oa/report/domain/AsraOp.java a/src/main/java/com/zteits/oa/report/domain/AsraOp.java new file mode 100644 index 0000000..142898d --- /dev/null +++ a/src/main/java/com/zteits/oa/report/domain/AsraOp.java @@ -0,0 +1,239 @@ +package com.zteits.oa.report.domain; + +import java.util.Date; + +public class AsraOp { + /**主键*/ + private Long id; + + /**登录工号*/ + private String loginCode; + + /**登录密码*/ + private String loginPassword; + + /**操作员姓名*/ + private String opName; + + /**员工邮箱*/ + private String email; + + /**角色ID*/ + private Long roleId; + + /**地市ID*/ + private Long cityId; + + /**地市名称*/ + private String cityName; + + /**上级领导id 领导:-1*/ + private Long parentId; + + /**是否邮件提醒 1:是,0:否*/ + private Integer isRemindEmail; + + /**数据状态：1有效，0无效,2:锁定*/ + private Integer dataState; + + /**创建人ID*/ + private String createEmpid; + + /**创建人*/ + private String createEmpName; + + /**创建时间*/ + private Date createDate; + + /**修改人*/ + private String modfiyEmpid; + + /**修改人*/ + private String modfiyEmpName; + + /**修改时间*/ + private Date modfiyDate; + + /**描述*/ + private String remark; + + /**获取主键*/ + public Long getId() { + return id; + } + + /**设置主键*/ + public void setId(Long id) { + this.id = id; + } + + /**获取登录工号*/ + public String getLoginCode() { + return loginCode; + } + + /**设置登录工号*/ + public void setLoginCode(String loginCode) { + this.loginCode = loginCode == null ? null : loginCode.trim(); + } + + /**获取登录密码*/ + public String getLoginPassword() { + return loginPassword; + } + + /**设置登录密码*/ + public void setLoginPassword(String loginPassword) { + this.loginPassword = loginPassword == null ? null : loginPassword.trim(); + } + + /**获取操作员姓名*/ + public String getOpName() { + return opName; + } + + /**设置操作员姓名*/ + public void setOpName(String opName) { + this.opName = opName == null ? null : opName.trim(); + } + + /**获取员工邮箱*/ + public String getEmail() { + return email; + } + + /**设置员工邮箱*/ + public void setEmail(String email) { + this.email = email == null ? null : email.trim(); + } + + /**获取角色ID*/ + public Long getRoleId() { + return roleId; + } + + /**设置角色ID*/ + public void setRoleId(Long roleId) { + this.roleId = roleId; + } + + /**获取地市ID*/ + public Long getCityId() { + return cityId; + } + + /**设置地市ID*/ + public void setCityId(Long cityId) { + this.cityId = cityId; + } + + /**获取地市名称*/ + public String getCityName() { + return cityName; + } + + /**设置地市名称*/ + public void setCityName(String cityName) { + this.cityName = cityName == null ? null : cityName.trim(); + } + + /**获取上级领导id 领导:-1*/ + public Long getParentId() { + return parentId; + } + + /**设置上级领导id 领导:-1*/ + public void setParentId(Long parentId) { + this.parentId = parentId; + } + + /**获取是否邮件提醒 1:是,0:否*/ + public Integer getIsRemindEmail() { + return isRemindEmail; + } + + /**设置是否邮件提醒 1:是,0:否*/ + public void setIsRemindEmail(Integer isRemindEmail) { + this.isRemindEmail = isRemindEmail; + } + + /**获取数据状态：1有效，0无效,2:锁定*/ + public Integer getDataState() { + return dataState; + } + + /**设置数据状态：1有效，0无效,2:锁定*/ + public void setDataState(Integer dataState) { + this.dataState = dataState; + } + + /**获取创建人ID*/ + public String getCreateEmpid() { + return createEmpid; + } + + /**设置创建人ID*/ + public void setCreateEmpid(String createEmpid) { + this.createEmpid = createEmpid == null ? null : createEmpid.trim(); + } + + /**获取创建人*/ + public String getCreateEmpName() { + return createEmpName; + } + + /**设置创建人*/ + public void setCreateEmpName(String createEmpName) { + this.createEmpName = createEmpName == null ? null : createEmpName.trim(); + } + + /**获取创建时间*/ + public Date getCreateDate() { + return createDate; + } + + /**设置创建时间*/ + public void setCreateDate(Date createDate) { + this.createDate = createDate; + } + + /**获取修改人*/ + public String getModfiyEmpid() { + return modfiyEmpid; + } + + /**设置修改人*/ + public void setModfiyEmpid(String modfiyEmpid) { + this.modfiyEmpid = modfiyEmpid == null ? null : modfiyEmpid.trim(); + } + + /**获取修改人*/ + public String getModfiyEmpName() { + return modfiyEmpName; + } + + /**设置修改人*/ + public void setModfiyEmpName(String modfiyEmpName) { + this.modfiyEmpName = modfiyEmpName == null ? null : modfiyEmpName.trim(); + } + + /**获取修改时间*/ + public Date getModfiyDate() { + return modfiyDate; + } + + /**设置修改时间*/ + public void setModfiyDate(Date modfiyDate) { + this.modfiyDate = modfiyDate; + } + + /**获取描述*/ + public String getRemark() { + return remark; + } + + /**设置描述*/ + public void setRemark(String remark) { + this.remark = remark == null ? null : remark.trim(); + } +} \ No newline at end of file diff --git b/src/main/java/com/zteits/oa/report/domain/AsraOpExample.java a/src/main/java/com/zteits/oa/report/domain/AsraOpExample.java new file mode 100644 index 0000000..090711c --- /dev/null +++ a/src/main/java/com/zteits/oa/report/domain/AsraOpExample.java @@ -0,0 +1,1381 @@ +package com.zteits.oa.report.domain; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class AsraOpExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public AsraOpExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + oredCriteria.add(criteria); + } + return criteria; + } + + protected Criteria createCriteriaInternal() { + Criteria criteria = new Criteria(); + return criteria; + } + + public void clear() { + oredCriteria.clear(); + orderByClause = null; + distinct = false; + } + + protected abstract static class GeneratedCriteria { + protected List criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + criteria.add(new Criterion(condition)); + } + + protected void addCriterion(String condition, Object value, String property) { + if (value == null) { + throw new RuntimeException("Value for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value)); + } + + protected void addCriterion(String condition, Object value1, Object value2, String property) { + if (value1 == null || value2 == null) { + throw new RuntimeException("Between values for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value1, value2)); + } + + public Criteria andIdIsNull() { + addCriterion("id is null"); + return (Criteria) this; + } + + public Criteria andIdIsNotNull() { + addCriterion("id is not null"); + return (Criteria) this; + } + + public Criteria andIdEqualTo(Long value) { + addCriterion("id =", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotEqualTo(Long value) { + addCriterion("id <>", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThan(Long value) { + addCriterion("id >", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThanOrEqualTo(Long value) { + addCriterion("id >=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThan(Long value) { + addCriterion("id <", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThanOrEqualTo(Long value) { + addCriterion("id <=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdIn(List values) { + addCriterion("id in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List values) { + addCriterion("id not in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdBetween(Long value1, Long value2) { + addCriterion("id between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andIdNotBetween(Long value1, Long value2) { + addCriterion("id not between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andLoginCodeIsNull() { + addCriterion("login_code is null"); + return (Criteria) this; + } + + public Criteria andLoginCodeIsNotNull() { + addCriterion("login_code is not null"); + return (Criteria) this; + } + + public Criteria andLoginCodeEqualTo(String value) { + addCriterion("login_code =", value, "loginCode"); + return (Criteria) this; + } + + public Criteria andLoginCodeNotEqualTo(String value) { + addCriterion("login_code <>", value, "loginCode"); + return (Criteria) this; + } + + public Criteria andLoginCodeGreaterThan(String value) { + addCriterion("login_code >", value, "loginCode"); + return (Criteria) this; + } + + public Criteria andLoginCodeGreaterThanOrEqualTo(String value) { + addCriterion("login_code >=", value, "loginCode"); + return (Criteria) this; + } + + public Criteria andLoginCodeLessThan(String value) { + addCriterion("login_code <", value, "loginCode"); + return (Criteria) this; + } + + public Criteria andLoginCodeLessThanOrEqualTo(String value) { + addCriterion("login_code <=", value, "loginCode"); + return (Criteria) this; + } + + public Criteria andLoginCodeLike(String value) { + addCriterion("login_code like", value, "loginCode"); + return (Criteria) this; + } + + public Criteria andLoginCodeNotLike(String value) { + addCriterion("login_code not like", value, "loginCode"); + return (Criteria) this; + } + + public Criteria andLoginCodeIn(List values) { + addCriterion("login_code in", values, "loginCode"); + return (Criteria) this; + } + + public Criteria andLoginCodeNotIn(List values) { + addCriterion("login_code not in", values, "loginCode"); + return (Criteria) this; + } + + public Criteria andLoginCodeBetween(String value1, String value2) { + addCriterion("login_code between", value1, value2, "loginCode"); + return (Criteria) this; + } + + public Criteria andLoginCodeNotBetween(String value1, String value2) { + addCriterion("login_code not between", value1, value2, "loginCode"); + return (Criteria) this; + } + + public Criteria andLoginPasswordIsNull() { + addCriterion("login_password is null"); + return (Criteria) this; + } + + public Criteria andLoginPasswordIsNotNull() { + addCriterion("login_password is not null"); + return (Criteria) this; + } + + public Criteria andLoginPasswordEqualTo(String value) { + addCriterion("login_password =", value, "loginPassword"); + return (Criteria) this; + } + + public Criteria andLoginPasswordNotEqualTo(String value) { + addCriterion("login_password <>", value, "loginPassword"); + return (Criteria) this; + } + + public Criteria andLoginPasswordGreaterThan(String value) { + addCriterion("login_password >", value, "loginPassword"); + return (Criteria) this; + } + + public Criteria andLoginPasswordGreaterThanOrEqualTo(String value) { + addCriterion("login_password >=", value, "loginPassword"); + return (Criteria) this; + } + + public Criteria andLoginPasswordLessThan(String value) { + addCriterion("login_password <", value, "loginPassword"); + return (Criteria) this; + } + + public Criteria andLoginPasswordLessThanOrEqualTo(String value) { + addCriterion("login_password <=", value, "loginPassword"); + return (Criteria) this; + } + + public Criteria andLoginPasswordLike(String value) { + addCriterion("login_password like", value, "loginPassword"); + return (Criteria) this; + } + + public Criteria andLoginPasswordNotLike(String value) { + addCriterion("login_password not like", value, "loginPassword"); + return (Criteria) this; + } + + public Criteria andLoginPasswordIn(List values) { + addCriterion("login_password in", values, "loginPassword"); + return (Criteria) this; + } + + public Criteria andLoginPasswordNotIn(List values) { + addCriterion("login_password not in", values, "loginPassword"); + return (Criteria) this; + } + + public Criteria andLoginPasswordBetween(String value1, String value2) { + addCriterion("login_password between", value1, value2, "loginPassword"); + return (Criteria) this; + } + + public Criteria andLoginPasswordNotBetween(String value1, String value2) { + addCriterion("login_password not between", value1, value2, "loginPassword"); + return (Criteria) this; + } + + public Criteria andOpNameIsNull() { + addCriterion("op_name is null"); + return (Criteria) this; + } + + public Criteria andOpNameIsNotNull() { + addCriterion("op_name is not null"); + return (Criteria) this; + } + + public Criteria andOpNameEqualTo(String value) { + addCriterion("op_name =", value, "opName"); + return (Criteria) this; + } + + public Criteria andOpNameNotEqualTo(String value) { + addCriterion("op_name <>", value, "opName"); + return (Criteria) this; + } + + public Criteria andOpNameGreaterThan(String value) { + addCriterion("op_name >", value, "opName"); + return (Criteria) this; + } + + public Criteria andOpNameGreaterThanOrEqualTo(String value) { + addCriterion("op_name >=", value, "opName"); + return (Criteria) this; + } + + public Criteria andOpNameLessThan(String value) { + addCriterion("op_name <", value, "opName"); + return (Criteria) this; + } + + public Criteria andOpNameLessThanOrEqualTo(String value) { + addCriterion("op_name <=", value, "opName"); + return (Criteria) this; + } + + public Criteria andOpNameLike(String value) { + addCriterion("op_name like", value, "opName"); + return (Criteria) this; + } + + public Criteria andOpNameNotLike(String value) { + addCriterion("op_name not like", value, "opName"); + return (Criteria) this; + } + + public Criteria andOpNameIn(List values) { + addCriterion("op_name in", values, "opName"); + return (Criteria) this; + } + + public Criteria andOpNameNotIn(List values) { + addCriterion("op_name not in", values, "opName"); + return (Criteria) this; + } + + public Criteria andOpNameBetween(String value1, String value2) { + addCriterion("op_name between", value1, value2, "opName"); + return (Criteria) this; + } + + public Criteria andOpNameNotBetween(String value1, String value2) { + addCriterion("op_name not between", value1, value2, "opName"); + return (Criteria) this; + } + + public Criteria andEmailIsNull() { + addCriterion("email is null"); + return (Criteria) this; + } + + public Criteria andEmailIsNotNull() { + addCriterion("email is not null"); + return (Criteria) this; + } + + public Criteria andEmailEqualTo(String value) { + addCriterion("email =", value, "email"); + return (Criteria) this; + } + + public Criteria andEmailNotEqualTo(String value) { + addCriterion("email <>", value, "email"); + return (Criteria) this; + } + + public Criteria andEmailGreaterThan(String value) { + addCriterion("email >", value, "email"); + return (Criteria) this; + } + + public Criteria andEmailGreaterThanOrEqualTo(String value) { + addCriterion("email >=", value, "email"); + return (Criteria) this; + } + + public Criteria andEmailLessThan(String value) { + addCriterion("email <", value, "email"); + return (Criteria) this; + } + + public Criteria andEmailLessThanOrEqualTo(String value) { + addCriterion("email <=", value, "email"); + return (Criteria) this; + } + + public Criteria andEmailLike(String value) { + addCriterion("email like", value, "email"); + return (Criteria) this; + } + + public Criteria andEmailNotLike(String value) { + addCriterion("email not like", value, "email"); + return (Criteria) this; + } + + public Criteria andEmailIn(List values) { + addCriterion("email in", values, "email"); + return (Criteria) this; + } + + public Criteria andEmailNotIn(List values) { + addCriterion("email not in", values, "email"); + return (Criteria) this; + } + + public Criteria andEmailBetween(String value1, String value2) { + addCriterion("email between", value1, value2, "email"); + return (Criteria) this; + } + + public Criteria andEmailNotBetween(String value1, String value2) { + addCriterion("email not between", value1, value2, "email"); + return (Criteria) this; + } + + public Criteria andRoleIdIsNull() { + addCriterion("role_id is null"); + return (Criteria) this; + } + + public Criteria andRoleIdIsNotNull() { + addCriterion("role_id is not null"); + return (Criteria) this; + } + + public Criteria andRoleIdEqualTo(Long value) { + addCriterion("role_id =", value, "roleId"); + return (Criteria) this; + } + + public Criteria andRoleIdNotEqualTo(Long value) { + addCriterion("role_id <>", value, "roleId"); + return (Criteria) this; + } + + public Criteria andRoleIdGreaterThan(Long value) { + addCriterion("role_id >", value, "roleId"); + return (Criteria) this; + } + + public Criteria andRoleIdGreaterThanOrEqualTo(Long value) { + addCriterion("role_id >=", value, "roleId"); + return (Criteria) this; + } + + public Criteria andRoleIdLessThan(Long value) { + addCriterion("role_id <", value, "roleId"); + return (Criteria) this; + } + + public Criteria andRoleIdLessThanOrEqualTo(Long value) { + addCriterion("role_id <=", value, "roleId"); + return (Criteria) this; + } + + public Criteria andRoleIdIn(List values) { + addCriterion("role_id in", values, "roleId"); + return (Criteria) this; + } + + public Criteria andRoleIdNotIn(List values) { + addCriterion("role_id not in", values, "roleId"); + return (Criteria) this; + } + + public Criteria andRoleIdBetween(Long value1, Long value2) { + addCriterion("role_id between", value1, value2, "roleId"); + return (Criteria) this; + } + + public Criteria andRoleIdNotBetween(Long value1, Long value2) { + addCriterion("role_id not between", value1, value2, "roleId"); + return (Criteria) this; + } + + public Criteria andCityIdIsNull() { + addCriterion("city_id is null"); + return (Criteria) this; + } + + public Criteria andCityIdIsNotNull() { + addCriterion("city_id is not null"); + return (Criteria) this; + } + + public Criteria andCityIdEqualTo(Long value) { + addCriterion("city_id =", value, "cityId"); + return (Criteria) this; + } + + public Criteria andCityIdNotEqualTo(Long value) { + addCriterion("city_id <>", value, "cityId"); + return (Criteria) this; + } + + public Criteria andCityIdGreaterThan(Long value) { + addCriterion("city_id >", value, "cityId"); + return (Criteria) this; + } + + public Criteria andCityIdGreaterThanOrEqualTo(Long value) { + addCriterion("city_id >=", value, "cityId"); + return (Criteria) this; + } + + public Criteria andCityIdLessThan(Long value) { + addCriterion("city_id <", value, "cityId"); + return (Criteria) this; + } + + public Criteria andCityIdLessThanOrEqualTo(Long value) { + addCriterion("city_id <=", value, "cityId"); + return (Criteria) this; + } + + public Criteria andCityIdIn(List values) { + addCriterion("city_id in", values, "cityId"); + return (Criteria) this; + } + + public Criteria andCityIdNotIn(List values) { + addCriterion("city_id not in", values, "cityId"); + return (Criteria) this; + } + + public Criteria andCityIdBetween(Long value1, Long value2) { + addCriterion("city_id between", value1, value2, "cityId"); + return (Criteria) this; + } + + public Criteria andCityIdNotBetween(Long value1, Long value2) { + addCriterion("city_id not between", value1, value2, "cityId"); + return (Criteria) this; + } + + public Criteria andCityNameIsNull() { + addCriterion("city_name is null"); + return (Criteria) this; + } + + public Criteria andCityNameIsNotNull() { + addCriterion("city_name is not null"); + return (Criteria) this; + } + + public Criteria andCityNameEqualTo(String value) { + addCriterion("city_name =", value, "cityName"); + return (Criteria) this; + } + + public Criteria andCityNameNotEqualTo(String value) { + addCriterion("city_name <>", value, "cityName"); + return (Criteria) this; + } + + public Criteria andCityNameGreaterThan(String value) { + addCriterion("city_name >", value, "cityName"); + return (Criteria) this; + } + + public Criteria andCityNameGreaterThanOrEqualTo(String value) { + addCriterion("city_name >=", value, "cityName"); + return (Criteria) this; + } + + public Criteria andCityNameLessThan(String value) { + addCriterion("city_name <", value, "cityName"); + return (Criteria) this; + } + + public Criteria andCityNameLessThanOrEqualTo(String value) { + addCriterion("city_name <=", value, "cityName"); + return (Criteria) this; + } + + public Criteria andCityNameLike(String value) { + addCriterion("city_name like", value, "cityName"); + return (Criteria) this; + } + + public Criteria andCityNameNotLike(String value) { + addCriterion("city_name not like", value, "cityName"); + return (Criteria) this; + } + + public Criteria andCityNameIn(List values) { + addCriterion("city_name in", values, "cityName"); + return (Criteria) this; + } + + public Criteria andCityNameNotIn(List values) { + addCriterion("city_name not in", values, "cityName"); + return (Criteria) this; + } + + public Criteria andCityNameBetween(String value1, String value2) { + addCriterion("city_name between", value1, value2, "cityName"); + return (Criteria) this; + } + + public Criteria andCityNameNotBetween(String value1, String value2) { + addCriterion("city_name not between", value1, value2, "cityName"); + return (Criteria) this; + } + + public Criteria andParentIdIsNull() { + addCriterion("parent_id is null"); + return (Criteria) this; + } + + public Criteria andParentIdIsNotNull() { + addCriterion("parent_id is not null"); + return (Criteria) this; + } + + public Criteria andParentIdEqualTo(Long value) { + addCriterion("parent_id =", value, "parentId"); + return (Criteria) this; + } + + public Criteria andParentIdNotEqualTo(Long value) { + addCriterion("parent_id <>", value, "parentId"); + return (Criteria) this; + } + + public Criteria andParentIdGreaterThan(Long value) { + addCriterion("parent_id >", value, "parentId"); + return (Criteria) this; + } + + public Criteria andParentIdGreaterThanOrEqualTo(Long value) { + addCriterion("parent_id >=", value, "parentId"); + return (Criteria) this; + } + + public Criteria andParentIdLessThan(Long value) { + addCriterion("parent_id <", value, "parentId"); + return (Criteria) this; + } + + public Criteria andParentIdLessThanOrEqualTo(Long value) { + addCriterion("parent_id <=", value, "parentId"); + return (Criteria) this; + } + + public Criteria andParentIdIn(List values) { + addCriterion("parent_id in", values, "parentId"); + return (Criteria) this; + } + + public Criteria andParentIdNotIn(List values) { + addCriterion("parent_id not in", values, "parentId"); + return (Criteria) this; + } + + public Criteria andParentIdBetween(Long value1, Long value2) { + addCriterion("parent_id between", value1, value2, "parentId"); + return (Criteria) this; + } + + public Criteria andParentIdNotBetween(Long value1, Long value2) { + addCriterion("parent_id not between", value1, value2, "parentId"); + return (Criteria) this; + } + + public Criteria andIsRemindEmailIsNull() { + addCriterion("is_remind_email is null"); + return (Criteria) this; + } + + public Criteria andIsRemindEmailIsNotNull() { + addCriterion("is_remind_email is not null"); + return (Criteria) this; + } + + public Criteria andIsRemindEmailEqualTo(Integer value) { + addCriterion("is_remind_email =", value, "isRemindEmail"); + return (Criteria) this; + } + + public Criteria andIsRemindEmailNotEqualTo(Integer value) { + addCriterion("is_remind_email <>", value, "isRemindEmail"); + return (Criteria) this; + } + + public Criteria andIsRemindEmailGreaterThan(Integer value) { + addCriterion("is_remind_email >", value, "isRemindEmail"); + return (Criteria) this; + } + + public Criteria andIsRemindEmailGreaterThanOrEqualTo(Integer value) { + addCriterion("is_remind_email >=", value, "isRemindEmail"); + return (Criteria) this; + } + + public Criteria andIsRemindEmailLessThan(Integer value) { + addCriterion("is_remind_email <", value, "isRemindEmail"); + return (Criteria) this; + } + + public Criteria andIsRemindEmailLessThanOrEqualTo(Integer value) { + addCriterion("is_remind_email <=", value, "isRemindEmail"); + return (Criteria) this; + } + + public Criteria andIsRemindEmailIn(List values) { + addCriterion("is_remind_email in", values, "isRemindEmail"); + return (Criteria) this; + } + + public Criteria andIsRemindEmailNotIn(List values) { + addCriterion("is_remind_email not in", values, "isRemindEmail"); + return (Criteria) this; + } + + public Criteria andIsRemindEmailBetween(Integer value1, Integer value2) { + addCriterion("is_remind_email between", value1, value2, "isRemindEmail"); + return (Criteria) this; + } + + public Criteria andIsRemindEmailNotBetween(Integer value1, Integer value2) { + addCriterion("is_remind_email not between", value1, value2, "isRemindEmail"); + return (Criteria) this; + } + + public Criteria andDataStateIsNull() { + addCriterion("data_state is null"); + return (Criteria) this; + } + + public Criteria andDataStateIsNotNull() { + addCriterion("data_state is not null"); + return (Criteria) this; + } + + public Criteria andDataStateEqualTo(Integer value) { + addCriterion("data_state =", value, "dataState"); + return (Criteria) this; + } + + public Criteria andDataStateNotEqualTo(Integer value) { + addCriterion("data_state <>", value, "dataState"); + return (Criteria) this; + } + + public Criteria andDataStateGreaterThan(Integer value) { + addCriterion("data_state >", value, "dataState"); + return (Criteria) this; + } + + public Criteria andDataStateGreaterThanOrEqualTo(Integer value) { + addCriterion("data_state >=", value, "dataState"); + return (Criteria) this; + } + + public Criteria andDataStateLessThan(Integer value) { + addCriterion("data_state <", value, "dataState"); + return (Criteria) this; + } + + public Criteria andDataStateLessThanOrEqualTo(Integer value) { + addCriterion("data_state <=", value, "dataState"); + return (Criteria) this; + } + + public Criteria andDataStateIn(List values) { + addCriterion("data_state in", values, "dataState"); + return (Criteria) this; + } + + public Criteria andDataStateNotIn(List values) { + addCriterion("data_state not in", values, "dataState"); + return (Criteria) this; + } + + public Criteria andDataStateBetween(Integer value1, Integer value2) { + addCriterion("data_state between", value1, value2, "dataState"); + return (Criteria) this; + } + + public Criteria andDataStateNotBetween(Integer value1, Integer value2) { + addCriterion("data_state not between", value1, value2, "dataState"); + return (Criteria) this; + } + + public Criteria andCreateEmpidIsNull() { + addCriterion("create_empid is null"); + return (Criteria) this; + } + + public Criteria andCreateEmpidIsNotNull() { + addCriterion("create_empid is not null"); + return (Criteria) this; + } + + public Criteria andCreateEmpidEqualTo(String value) { + addCriterion("create_empid =", value, "createEmpid"); + return (Criteria) this; + } + + public Criteria andCreateEmpidNotEqualTo(String value) { + addCriterion("create_empid <>", value, "createEmpid"); + return (Criteria) this; + } + + public Criteria andCreateEmpidGreaterThan(String value) { + addCriterion("create_empid >", value, "createEmpid"); + return (Criteria) this; + } + + public Criteria andCreateEmpidGreaterThanOrEqualTo(String value) { + addCriterion("create_empid >=", value, "createEmpid"); + return (Criteria) this; + } + + public Criteria andCreateEmpidLessThan(String value) { + addCriterion("create_empid <", value, "createEmpid"); + return (Criteria) this; + } + + public Criteria andCreateEmpidLessThanOrEqualTo(String value) { + addCriterion("create_empid <=", value, "createEmpid"); + return (Criteria) this; + } + + public Criteria andCreateEmpidLike(String value) { + addCriterion("create_empid like", value, "createEmpid"); + return (Criteria) this; + } + + public Criteria andCreateEmpidNotLike(String value) { + addCriterion("create_empid not like", value, "createEmpid"); + return (Criteria) this; + } + + public Criteria andCreateEmpidIn(List values) { + addCriterion("create_empid in", values, "createEmpid"); + return (Criteria) this; + } + + public Criteria andCreateEmpidNotIn(List values) { + addCriterion("create_empid not in", values, "createEmpid"); + return (Criteria) this; + } + + public Criteria andCreateEmpidBetween(String value1, String value2) { + addCriterion("create_empid between", value1, value2, "createEmpid"); + return (Criteria) this; + } + + public Criteria andCreateEmpidNotBetween(String value1, String value2) { + addCriterion("create_empid not between", value1, value2, "createEmpid"); + return (Criteria) this; + } + + public Criteria andCreateEmpNameIsNull() { + addCriterion("create_emp_name is null"); + return (Criteria) this; + } + + public Criteria andCreateEmpNameIsNotNull() { + addCriterion("create_emp_name is not null"); + return (Criteria) this; + } + + public Criteria andCreateEmpNameEqualTo(String value) { + addCriterion("create_emp_name =", value, "createEmpName"); + return (Criteria) this; + } + + public Criteria andCreateEmpNameNotEqualTo(String value) { + addCriterion("create_emp_name <>", value, "createEmpName"); + return (Criteria) this; + } + + public Criteria andCreateEmpNameGreaterThan(String value) { + addCriterion("create_emp_name >", value, "createEmpName"); + return (Criteria) this; + } + + public Criteria andCreateEmpNameGreaterThanOrEqualTo(String value) { + addCriterion("create_emp_name >=", value, "createEmpName"); + return (Criteria) this; + } + + public Criteria andCreateEmpNameLessThan(String value) { + addCriterion("create_emp_name <", value, "createEmpName"); + return (Criteria) this; + } + + public Criteria andCreateEmpNameLessThanOrEqualTo(String value) { + addCriterion("create_emp_name <=", value, "createEmpName"); + return (Criteria) this; + } + + public Criteria andCreateEmpNameLike(String value) { + addCriterion("create_emp_name like", value, "createEmpName"); + return (Criteria) this; + } + + public Criteria andCreateEmpNameNotLike(String value) { + addCriterion("create_emp_name not like", value, "createEmpName"); + return (Criteria) this; + } + + public Criteria andCreateEmpNameIn(List values) { + addCriterion("create_emp_name in", values, "createEmpName"); + return (Criteria) this; + } + + public Criteria andCreateEmpNameNotIn(List values) { + addCriterion("create_emp_name not in", values, "createEmpName"); + return (Criteria) this; + } + + public Criteria andCreateEmpNameBetween(String value1, String value2) { + addCriterion("create_emp_name between", value1, value2, "createEmpName"); + return (Criteria) this; + } + + public Criteria andCreateEmpNameNotBetween(String value1, String value2) { + addCriterion("create_emp_name not between", value1, value2, "createEmpName"); + return (Criteria) this; + } + + public Criteria andCreateDateIsNull() { + addCriterion("create_date is null"); + return (Criteria) this; + } + + public Criteria andCreateDateIsNotNull() { + addCriterion("create_date is not null"); + return (Criteria) this; + } + + public Criteria andCreateDateEqualTo(Date value) { + addCriterion("create_date =", value, "createDate"); + return (Criteria) this; + } + + public Criteria andCreateDateNotEqualTo(Date value) { + addCriterion("create_date <>", value, "createDate"); + return (Criteria) this; + } + + public Criteria andCreateDateGreaterThan(Date value) { + addCriterion("create_date >", value, "createDate"); + return (Criteria) this; + } + + public Criteria andCreateDateGreaterThanOrEqualTo(Date value) { + addCriterion("create_date >=", value, "createDate"); + return (Criteria) this; + } + + public Criteria andCreateDateLessThan(Date value) { + addCriterion("create_date <", value, "createDate"); + return (Criteria) this; + } + + public Criteria andCreateDateLessThanOrEqualTo(Date value) { + addCriterion("create_date <=", value, "createDate"); + return (Criteria) this; + } + + public Criteria andCreateDateIn(List values) { + addCriterion("create_date in", values, "createDate"); + return (Criteria) this; + } + + public Criteria andCreateDateNotIn(List values) { + addCriterion("create_date not in", values, "createDate"); + return (Criteria) this; + } + + public Criteria andCreateDateBetween(Date value1, Date value2) { + addCriterion("create_date between", value1, value2, "createDate"); + return (Criteria) this; + } + + public Criteria andCreateDateNotBetween(Date value1, Date value2) { + addCriterion("create_date not between", value1, value2, "createDate"); + return (Criteria) this; + } + + public Criteria andModfiyEmpidIsNull() { + addCriterion("modfiy_empid is null"); + return (Criteria) this; + } + + public Criteria andModfiyEmpidIsNotNull() { + addCriterion("modfiy_empid is not null"); + return (Criteria) this; + } + + public Criteria andModfiyEmpidEqualTo(String value) { + addCriterion("modfiy_empid =", value, "modfiyEmpid"); + return (Criteria) this; + } + + public Criteria andModfiyEmpidNotEqualTo(String value) { + addCriterion("modfiy_empid <>", value, "modfiyEmpid"); + return (Criteria) this; + } + + public Criteria andModfiyEmpidGreaterThan(String value) { + addCriterion("modfiy_empid >", value, "modfiyEmpid"); + return (Criteria) this; + } + + public Criteria andModfiyEmpidGreaterThanOrEqualTo(String value) { + addCriterion("modfiy_empid >=", value, "modfiyEmpid"); + return (Criteria) this; + } + + public Criteria andModfiyEmpidLessThan(String value) { + addCriterion("modfiy_empid <", value, "modfiyEmpid"); + return (Criteria) this; + } + + public Criteria andModfiyEmpidLessThanOrEqualTo(String value) { + addCriterion("modfiy_empid <=", value, "modfiyEmpid"); + return (Criteria) this; + } + + public Criteria andModfiyEmpidLike(String value) { + addCriterion("modfiy_empid like", value, "modfiyEmpid"); + return (Criteria) this; + } + + public Criteria andModfiyEmpidNotLike(String value) { + addCriterion("modfiy_empid not like", value, "modfiyEmpid"); + return (Criteria) this; + } + + public Criteria andModfiyEmpidIn(List values) { + addCriterion("modfiy_empid in", values, "modfiyEmpid"); + return (Criteria) this; + } + + public Criteria andModfiyEmpidNotIn(List values) { + addCriterion("modfiy_empid not in", values, "modfiyEmpid"); + return (Criteria) this; + } + + public Criteria andModfiyEmpidBetween(String value1, String value2) { + addCriterion("modfiy_empid between", value1, value2, "modfiyEmpid"); + return (Criteria) this; + } + + public Criteria andModfiyEmpidNotBetween(String value1, String value2) { + addCriterion("modfiy_empid not between", value1, value2, "modfiyEmpid"); + return (Criteria) this; + } + + public Criteria andModfiyEmpNameIsNull() { + addCriterion("modfiy_emp_name is null"); + return (Criteria) this; + } + + public Criteria andModfiyEmpNameIsNotNull() { + addCriterion("modfiy_emp_name is not null"); + return (Criteria) this; + } + + public Criteria andModfiyEmpNameEqualTo(String value) { + addCriterion("modfiy_emp_name =", value, "modfiyEmpName"); + return (Criteria) this; + } + + public Criteria andModfiyEmpNameNotEqualTo(String value) { + addCriterion("modfiy_emp_name <>", value, "modfiyEmpName"); + return (Criteria) this; + } + + public Criteria andModfiyEmpNameGreaterThan(String value) { + addCriterion("modfiy_emp_name >", value, "modfiyEmpName"); + return (Criteria) this; + } + + public Criteria andModfiyEmpNameGreaterThanOrEqualTo(String value) { + addCriterion("modfiy_emp_name >=", value, "modfiyEmpName"); + return (Criteria) this; + } + + public Criteria andModfiyEmpNameLessThan(String value) { + addCriterion("modfiy_emp_name <", value, "modfiyEmpName"); + return (Criteria) this; + } + + public Criteria andModfiyEmpNameLessThanOrEqualTo(String value) { + addCriterion("modfiy_emp_name <=", value, "modfiyEmpName"); + return (Criteria) this; + } + + public Criteria andModfiyEmpNameLike(String value) { + addCriterion("modfiy_emp_name like", value, "modfiyEmpName"); + return (Criteria) this; + } + + public Criteria andModfiyEmpNameNotLike(String value) { + addCriterion("modfiy_emp_name not like", value, "modfiyEmpName"); + return (Criteria) this; + } + + public Criteria andModfiyEmpNameIn(List values) { + addCriterion("modfiy_emp_name in", values, "modfiyEmpName"); + return (Criteria) this; + } + + public Criteria andModfiyEmpNameNotIn(List values) { + addCriterion("modfiy_emp_name not in", values, "modfiyEmpName"); + return (Criteria) this; + } + + public Criteria andModfiyEmpNameBetween(String value1, String value2) { + addCriterion("modfiy_emp_name between", value1, value2, "modfiyEmpName"); + return (Criteria) this; + } + + public Criteria andModfiyEmpNameNotBetween(String value1, String value2) { + addCriterion("modfiy_emp_name not between", value1, value2, "modfiyEmpName"); + return (Criteria) this; + } + + public Criteria andModfiyDateIsNull() { + addCriterion("modfiy_date is null"); + return (Criteria) this; + } + + public Criteria andModfiyDateIsNotNull() { + addCriterion("modfiy_date is not null"); + return (Criteria) this; + } + + public Criteria andModfiyDateEqualTo(Date value) { + addCriterion("modfiy_date =", value, "modfiyDate"); + return (Criteria) this; + } + + public Criteria andModfiyDateNotEqualTo(Date value) { + addCriterion("modfiy_date <>", value, "modfiyDate"); + return (Criteria) this; + } + + public Criteria andModfiyDateGreaterThan(Date value) { + addCriterion("modfiy_date >", value, "modfiyDate"); + return (Criteria) this; + } + + public Criteria andModfiyDateGreaterThanOrEqualTo(Date value) { + addCriterion("modfiy_date >=", value, "modfiyDate"); + return (Criteria) this; + } + + public Criteria andModfiyDateLessThan(Date value) { + addCriterion("modfiy_date <", value, "modfiyDate"); + return (Criteria) this; + } + + public Criteria andModfiyDateLessThanOrEqualTo(Date value) { + addCriterion("modfiy_date <=", value, "modfiyDate"); + return (Criteria) this; + } + + public Criteria andModfiyDateIn(List values) { + addCriterion("modfiy_date in", values, "modfiyDate"); + return (Criteria) this; + } + + public Criteria andModfiyDateNotIn(List values) { + addCriterion("modfiy_date not in", values, "modfiyDate"); + return (Criteria) this; + } + + public Criteria andModfiyDateBetween(Date value1, Date value2) { + addCriterion("modfiy_date between", value1, value2, "modfiyDate"); + return (Criteria) this; + } + + public Criteria andModfiyDateNotBetween(Date value1, Date value2) { + addCriterion("modfiy_date not between", value1, value2, "modfiyDate"); + return (Criteria) this; + } + + public Criteria andRemarkIsNull() { + addCriterion("remark is null"); + return (Criteria) this; + } + + public Criteria andRemarkIsNotNull() { + addCriterion("remark is not null"); + return (Criteria) this; + } + + public Criteria andRemarkEqualTo(String value) { + addCriterion("remark =", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkNotEqualTo(String value) { + addCriterion("remark <>", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkGreaterThan(String value) { + addCriterion("remark >", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkGreaterThanOrEqualTo(String value) { + addCriterion("remark >=", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkLessThan(String value) { + addCriterion("remark <", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkLessThanOrEqualTo(String value) { + addCriterion("remark <=", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkLike(String value) { + addCriterion("remark like", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkNotLike(String value) { + addCriterion("remark not like", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkIn(List values) { + addCriterion("remark in", values, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkNotIn(List values) { + addCriterion("remark not in", values, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkBetween(String value1, String value2) { + addCriterion("remark between", value1, value2, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkNotBetween(String value1, String value2) { + addCriterion("remark not between", value1, value2, "remark"); + return (Criteria) this; + } + } + + public static class Criteria extends GeneratedCriteria { + + protected Criteria() { + super(); + } + } + + public static class Criterion { + private String condition; + + private Object value; + + private Object secondValue; + + private boolean noValue; + + private boolean singleValue; + + private boolean betweenValue; + + private boolean listValue; + + private String typeHandler; + + public String getCondition() { + return condition; + } + + public Object getValue() { + return value; + } + + public Object getSecondValue() { + return secondValue; + } + + public boolean isNoValue() { + return noValue; + } + + public boolean isSingleValue() { + return singleValue; + } + + public boolean isBetweenValue() { + return betweenValue; + } + + public boolean isListValue() { + return listValue; + } + + public String getTypeHandler() { + return typeHandler; + } + + protected Criterion(String condition) { + super(); + this.condition = condition; + this.typeHandler = null; + this.noValue = true; + } + + protected Criterion(String condition, Object value, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.typeHandler = typeHandler; + if (value instanceof List) { + this.listValue = true; + } else { + this.singleValue = true; + } + } + + protected Criterion(String condition, Object value) { + this(condition, value, null); + } + + protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.secondValue = secondValue; + this.typeHandler = typeHandler; + this.betweenValue = true; + } + + protected Criterion(String condition, Object value, Object secondValue) { + this(condition, value, secondValue, null); + } + } +} \ No newline at end of file diff --git b/src/main/java/com/zteits/oa/report/mapper/AsraOpMapper.java a/src/main/java/com/zteits/oa/report/mapper/AsraOpMapper.java new file mode 100644 index 0000000..6b69ac8 --- /dev/null +++ a/src/main/java/com/zteits/oa/report/mapper/AsraOpMapper.java @@ -0,0 +1,30 @@ +package com.zteits.oa.report.mapper; + +import com.zteits.oa.report.domain.AsraOp; +import com.zteits.oa.report.domain.AsraOpExample; +import java.util.List; +import org.apache.ibatis.annotations.Param; + +public interface AsraOpMapper { + long countByExample(AsraOpExample example); + + int deleteByExample(AsraOpExample example); + + int deleteByPrimaryKey(Long id); + + int insert(AsraOp record); + + int insertSelective(AsraOp record); + + List selectByExample(AsraOpExample example); + + AsraOp selectByPrimaryKey(Long id); + + int updateByExampleSelective(@Param("record") AsraOp record, @Param("example") AsraOpExample example); + + int updateByExample(@Param("record") AsraOp record, @Param("example") AsraOpExample example); + + int updateByPrimaryKeySelective(AsraOp record); + + int updateByPrimaryKey(AsraOp record); +} \ No newline at end of file diff --git b/src/main/java/com/zteits/oa/util/ListCopyUtil.java a/src/main/java/com/zteits/oa/util/ListCopyUtil.java new file mode 100644 index 0000000..3bebbe7 --- /dev/null +++ a/src/main/java/com/zteits/oa/util/ListCopyUtil.java @@ -0,0 +1,49 @@ +package com.zteits.oa.util; + +import java.util.List; + +import org.springframework.beans.BeanUtils; +import org.springframework.util.CollectionUtils; + +/** + * list 拷贝util.
+ * + * Copyright: Copyright (c) 2017 zteits + * + * @ClassName: ListUtil.java + * @Description: + * @version: v1.0.0 + * @author: wangfs + * @date: 2017年8月10日 下午4:31:27 + * Modification History: + * Date Author Version Description + *---------------------------------------------------------* + * 2017年8月10日 wangfs v1.0.0 创建 + */ +public class ListCopyUtil { + + /** + * list 拷贝.
+ * @param form + * @param to + * @param clazz + */ + public static void listCopyProperties(List form,List to,Class clazz){ + if(!CollectionUtils.isEmpty(form)){ + for(DO strDO:form){ + if(strDO != null){ + try { + DTO dto =clazz.newInstance(); + BeanUtils.copyProperties(strDO, dto); + to.add(dto); + } catch (InstantiationException e) { + e.printStackTrace(); + } catch (IllegalAccessException e) { + e.printStackTrace(); + } + } + } + } + + } +} diff --git b/src/main/java/com/zteits/oa/util/MybatisGenerateRun.java a/src/main/java/com/zteits/oa/util/MybatisGenerateRun.java new file mode 100644 index 0000000..7cf4b90 --- /dev/null +++ a/src/main/java/com/zteits/oa/util/MybatisGenerateRun.java @@ -0,0 +1,42 @@ +package com.zteits.oa.util; + +import java.io.File; +import java.io.IOException; +import java.sql.SQLException; +import java.util.ArrayList; +import java.util.List; +import java.util.Properties; + +import org.mybatis.generator.api.MyBatisGenerator; +import org.mybatis.generator.config.Configuration; +import org.mybatis.generator.config.xml.ConfigurationParser; +import org.mybatis.generator.exception.InvalidConfigurationException; +import org.mybatis.generator.exception.XMLParserException; +import org.mybatis.generator.internal.DefaultShellCallback; +import org.springframework.core.io.support.PropertiesLoaderUtils; +import org.springframework.util.CollectionUtils; +/** + * 生成mybaits相关mapper,domain,dao等 + * + */ +public class MybatisGenerateRun { + public static void main(String[] args) throws IOException, XMLParserException, InvalidConfigurationException, SQLException, InterruptedException { + List warnings = new ArrayList(); + boolean overwrite = true; + //加载generatorEmallConfig文件 + File configFile = new File(MybatisGenerateRun.class.getClassLoader().getResource("generator/generatorConfig.xml").getPath()); + //加载数据库设置相关配置文件 + Properties extraProperties = PropertiesLoaderUtils.loadAllProperties("application.properties"); + ConfigurationParser cp = new ConfigurationParser(extraProperties, warnings); + Configuration config = cp.parseConfiguration(configFile); + DefaultShellCallback callback = new DefaultShellCallback(overwrite); + MyBatisGenerator myBatisGenerator = new MyBatisGenerator(config, callback, warnings); + myBatisGenerator.generate(null); + if(!CollectionUtils.isEmpty(warnings)){ + for (String warn : warnings) { + System.out.println(warn); + } + } + System.out.println("生成成功！"); + } +} diff --git b/src/main/java/com/zteits/oa/util/MybatisGeneratorCommon.java a/src/main/java/com/zteits/oa/util/MybatisGeneratorCommon.java new file mode 100644 index 0000000..f6bd538 --- /dev/null +++ a/src/main/java/com/zteits/oa/util/MybatisGeneratorCommon.java @@ -0,0 +1,79 @@ +package com.zteits.oa.util; + +import java.util.Properties; + +import org.mybatis.generator.api.CommentGenerator; +import org.mybatis.generator.api.IntrospectedColumn; +import org.mybatis.generator.api.IntrospectedTable; +import org.mybatis.generator.api.dom.java.CompilationUnit; +import org.mybatis.generator.api.dom.java.Field; +import org.mybatis.generator.api.dom.java.InnerClass; +import org.mybatis.generator.api.dom.java.InnerEnum; +import org.mybatis.generator.api.dom.java.Method; +import org.mybatis.generator.api.dom.java.TopLevelClass; +import org.mybatis.generator.api.dom.xml.XmlElement; +import org.springframework.util.StringUtils; + +/** + * 自定义Mybatis注释 使用数据库中的注释 + * + */ +public class MybatisGeneratorCommon implements CommentGenerator{ + + @Override + public void addConfigurationProperties(Properties properties) {} + + @Override + public void addFieldComment(Field field, IntrospectedTable introspectedTable, + IntrospectedColumn introspectedColumn) { + if(StringUtils.isEmpty(introspectedColumn.getRemarks())){ + return; + } + field.addJavaDocLine("/**"+introspectedColumn.getRemarks()+"*/"); + } + + @Override + public void addFieldComment(Field field, IntrospectedTable introspectedTable) {} + + @Override + public void addModelClassComment(TopLevelClass topLevelClass, IntrospectedTable introspectedTable) {} + + @Override + public void addClassComment(InnerClass innerClass, IntrospectedTable introspectedTable) {} + + @Override + public void addClassComment(InnerClass innerClass, IntrospectedTable introspectedTable, boolean markAsDoNotDelete) {} + + @Override + public void addEnumComment(InnerEnum innerEnum, IntrospectedTable introspectedTable) {} + + @Override + public void addGetterComment(Method method, IntrospectedTable introspectedTable, + IntrospectedColumn introspectedColumn) { + if(StringUtils.isEmpty(introspectedColumn.getRemarks())){ + return; + } + method.addJavaDocLine("/**获取"+introspectedColumn.getRemarks()+"*/"); + } + + @Override + public void addSetterComment(Method method, IntrospectedTable introspectedTable, + IntrospectedColumn introspectedColumn) { + if(StringUtils.isEmpty(introspectedColumn.getRemarks())){ + return; + } + method.addJavaDocLine("/**设置"+introspectedColumn.getRemarks()+"*/"); + } + + @Override + public void addGeneralMethodComment(Method method, IntrospectedTable introspectedTable) {} + + @Override + public void addJavaFileComment(CompilationUnit compilationUnit) {} + + @Override + public void addComment(XmlElement xmlElement) {} + + @Override + public void addRootComment(XmlElement rootElement) {} +} diff --git b/src/main/resources/application.properties a/src/main/resources/application.properties new file mode 100644 index 0000000..b464c3c --- /dev/null +++ a/src/main/resources/application.properties @@ -0,0 +1,64 @@ +spring.application.name=zteits_daily_report +server.port=8100 + +#spring.profiles.active=prod +# logging +logging.level.root=info +logging.path=./logs/${spring.application.name} +logging.file=${spring.application.name}.log +logging.config=classpath:logback-spring.xml + +local.base.url=http://pay.service.rnting.com + + +druid.driverClass=com.mysql.jdbc.Driver +druid.url=jdbc:mysql://192.168.1.167:3306/zt_asra?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true +druid.username=root +druid.password=root + +druid.initialSize=1 +druid.minIdle=1 +druid.maxActive=20 +druid.filters=stat,wall +druid.maxWait=60000 +druid.timeBetweenEvictionRunsMillis=3000 +druid.minEvictableIdleTimeMillis=300000 +druid.validationQuery=SELECT 'x' +druid.testOnBorrow=true +druid.testOnReturn=false + + +#mybatis.mapper-locations=classpath*:mybatis/*mapper/*.xml +mybatis.type-aliases-package=com.zteits.oa.report.domain +mybatis.mapper-locations=classpath*:mybatis/*mapper/*.xml +#mapper.mappers=com.zteits.sys.util.MyMapper +mapper.not-empty=false +mapper.identity=MYSQL + + +pagehelper.dialect=com.github.pagehelper.PageHelper +pagehelper.helperDialect=mysql +pagehelper.reasonable=true +pagehelper.supportMethodsArguments=true +pagehelper.params=countSql + + + + + +#47 redis +spring.redis.host=47.96.41.38 +spring.redis.port=7001 +spring.redis.password=myredis +spring.redis.database=0 + + + +#\u5404\u79CD\u5F00\u5173,\u65B9\u4FBF\u4E0D\u540C\u73AF\u5883\u7684\u914D\u7F6E +switch.auto.default=false + +switch.auto.XxlJobConfiguration=${switch.auto.default} + + + + diff --git b/src/main/resources/generator/generatorConfig.xml a/src/main/resources/generator/generatorConfig.xml new file mode 100644 index 0000000..5bcad84 --- /dev/null +++ a/src/main/resources/generator/generatorConfig.xml @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + \ No newline at end of file diff --git b/src/main/resources/logback-spring.xml a/src/main/resources/logback-spring.xml new file mode 100644 index 0000000..1ee1460 --- /dev/null +++ a/src/main/resources/logback-spring.xml @@ -0,0 +1,34 @@ + + + ${LOG_PATH}/${LOG_FILE} + + + ${logging.path}${logging.file}-%d{yyyy-MM-dd}.%i.log + + 1GB + 60 + 20GB + + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n + + + + + + + + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n + UTF-8 + + + + + + + diff --git b/src/main/resources/mybatis/mapper/AsraOpMapper.xml a/src/main/resources/mybatis/mapper/AsraOpMapper.xml new file mode 100644 index 0000000..aa0321d --- /dev/null +++ a/src/main/resources/mybatis/mapper/AsraOpMapper.xml @@ -0,0 +1,416 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + id, login_code, login_password, op_name, email, role_id, city_id, city_name, parent_id, + is_remind_email, data_state, create_empid, create_emp_name, create_date, modfiy_empid, + modfiy_emp_name, modfiy_date, remark + + + + + delete from asra_op + where id = #{id,jdbcType=BIGINT} + + + delete from asra_op + + + + + + + SELECT LAST_INSERT_ID() + + insert into asra_op (login_code, login_password, op_name, + email, role_id, city_id, + city_name, parent_id, is_remind_email, + data_state, create_empid, create_emp_name, + create_date, modfiy_empid, modfiy_emp_name, + modfiy_date, remark) + values (#{loginCode,jdbcType=VARCHAR}, #{loginPassword,jdbcType=VARCHAR}, #{opName,jdbcType=VARCHAR}, + #{email,jdbcType=VARCHAR}, #{roleId,jdbcType=BIGINT}, #{cityId,jdbcType=BIGINT}, + #{cityName,jdbcType=VARCHAR}, #{parentId,jdbcType=BIGINT}, #{isRemindEmail,jdbcType=INTEGER}, + #{dataState,jdbcType=INTEGER}, #{createEmpid,jdbcType=VARCHAR}, #{createEmpName,jdbcType=VARCHAR}, + #{createDate,jdbcType=TIMESTAMP}, #{modfiyEmpid,jdbcType=VARCHAR}, #{modfiyEmpName,jdbcType=VARCHAR}, + #{modfiyDate,jdbcType=TIMESTAMP}, #{remark,jdbcType=VARCHAR}) + + + + SELECT LAST_INSERT_ID() + + insert into asra_op + + + login_code, + + + login_password, + + + op_name, + + + email, + + + role_id, + + + city_id, + + + city_name, + + + parent_id, + + + is_remind_email, + + + data_state, + + + create_empid, + + + create_emp_name, + + + create_date, + + + modfiy_empid, + + + modfiy_emp_name, + + + modfiy_date, + + + remark, + + + + + #{loginCode,jdbcType=VARCHAR}, + + + #{loginPassword,jdbcType=VARCHAR}, + + + #{opName,jdbcType=VARCHAR}, + + + #{email,jdbcType=VARCHAR}, + + + #{roleId,jdbcType=BIGINT}, + + + #{cityId,jdbcType=BIGINT}, + + + #{cityName,jdbcType=VARCHAR}, + + + #{parentId,jdbcType=BIGINT}, + + + #{isRemindEmail,jdbcType=INTEGER}, + + + #{dataState,jdbcType=INTEGER}, + + + #{createEmpid,jdbcType=VARCHAR}, + + + #{createEmpName,jdbcType=VARCHAR}, + + + #{createDate,jdbcType=TIMESTAMP}, + + + #{modfiyEmpid,jdbcType=VARCHAR}, + + + #{modfiyEmpName,jdbcType=VARCHAR}, + + + #{modfiyDate,jdbcType=TIMESTAMP}, + + + #{remark,jdbcType=VARCHAR}, + + + + + + update asra_op + + + id = #{record.id,jdbcType=BIGINT}, + + + login_code = #{record.loginCode,jdbcType=VARCHAR}, + + + login_password = #{record.loginPassword,jdbcType=VARCHAR}, + + + op_name = #{record.opName,jdbcType=VARCHAR}, + + + email = #{record.email,jdbcType=VARCHAR}, + + + role_id = #{record.roleId,jdbcType=BIGINT}, + + + city_id = #{record.cityId,jdbcType=BIGINT}, + + + city_name = #{record.cityName,jdbcType=VARCHAR}, + + + parent_id = #{record.parentId,jdbcType=BIGINT}, + + + is_remind_email = #{record.isRemindEmail,jdbcType=INTEGER}, + + + data_state = #{record.dataState,jdbcType=INTEGER}, + + + create_empid = #{record.createEmpid,jdbcType=VARCHAR}, + + + create_emp_name = #{record.createEmpName,jdbcType=VARCHAR}, + + + create_date = #{record.createDate,jdbcType=TIMESTAMP}, + + + modfiy_empid = #{record.modfiyEmpid,jdbcType=VARCHAR}, + + + modfiy_emp_name = #{record.modfiyEmpName,jdbcType=VARCHAR}, + + + modfiy_date = #{record.modfiyDate,jdbcType=TIMESTAMP}, + + + remark = #{record.remark,jdbcType=VARCHAR}, + + + + + + + + update asra_op + set id = #{record.id,jdbcType=BIGINT}, + login_code = #{record.loginCode,jdbcType=VARCHAR}, + login_password = #{record.loginPassword,jdbcType=VARCHAR}, + op_name = #{record.opName,jdbcType=VARCHAR}, + email = #{record.email,jdbcType=VARCHAR}, + role_id = #{record.roleId,jdbcType=BIGINT}, + city_id = #{record.cityId,jdbcType=BIGINT}, + city_name = #{record.cityName,jdbcType=VARCHAR}, + parent_id = #{record.parentId,jdbcType=BIGINT}, + is_remind_email = #{record.isRemindEmail,jdbcType=INTEGER}, + data_state = #{record.dataState,jdbcType=INTEGER}, + create_empid = #{record.createEmpid,jdbcType=VARCHAR}, + create_emp_name = #{record.createEmpName,jdbcType=VARCHAR}, + create_date = #{record.createDate,jdbcType=TIMESTAMP}, + modfiy_empid = #{record.modfiyEmpid,jdbcType=VARCHAR}, + modfiy_emp_name = #{record.modfiyEmpName,jdbcType=VARCHAR}, + modfiy_date = #{record.modfiyDate,jdbcType=TIMESTAMP}, + remark = #{record.remark,jdbcType=VARCHAR} + + + + + + update asra_op + + + login_code = #{loginCode,jdbcType=VARCHAR}, + + + login_password = #{loginPassword,jdbcType=VARCHAR}, + + + op_name = #{opName,jdbcType=VARCHAR}, + + + email = #{email,jdbcType=VARCHAR}, + + + role_id = #{roleId,jdbcType=BIGINT}, + + + city_id = #{cityId,jdbcType=BIGINT}, + + + city_name = #{cityName,jdbcType=VARCHAR}, + + + parent_id = #{parentId,jdbcType=BIGINT}, + + + is_remind_email = #{isRemindEmail,jdbcType=INTEGER}, + + + data_state = #{dataState,jdbcType=INTEGER}, + + + create_empid = #{createEmpid,jdbcType=VARCHAR}, + + + create_emp_name = #{createEmpName,jdbcType=VARCHAR}, + + + create_date = #{createDate,jdbcType=TIMESTAMP}, + + + modfiy_empid = #{modfiyEmpid,jdbcType=VARCHAR}, + + + modfiy_emp_name = #{modfiyEmpName,jdbcType=VARCHAR}, + + + modfiy_date = #{modfiyDate,jdbcType=TIMESTAMP}, + + + remark = #{remark,jdbcType=VARCHAR}, + + + where id = #{id,jdbcType=BIGINT} + + + update asra_op + set login_code = #{loginCode,jdbcType=VARCHAR}, + login_password = #{loginPassword,jdbcType=VARCHAR}, + op_name = #{opName,jdbcType=VARCHAR}, + email = #{email,jdbcType=VARCHAR}, + role_id = #{roleId,jdbcType=BIGINT}, + city_id = #{cityId,jdbcType=BIGINT}, + city_name = #{cityName,jdbcType=VARCHAR}, + parent_id = #{parentId,jdbcType=BIGINT}, + is_remind_email = #{isRemindEmail,jdbcType=INTEGER}, + data_state = #{dataState,jdbcType=INTEGER}, + create_empid = #{createEmpid,jdbcType=VARCHAR}, + create_emp_name = #{createEmpName,jdbcType=VARCHAR}, + create_date = #{createDate,jdbcType=TIMESTAMP}, + modfiy_empid = #{modfiyEmpid,jdbcType=VARCHAR}, + modfiy_emp_name = #{modfiyEmpName,jdbcType=VARCHAR}, + modfiy_date = #{modfiyDate,jdbcType=TIMESTAMP}, + remark = #{remark,jdbcType=VARCHAR} + where id = #{id,jdbcType=BIGINT} + + \ No newline at end of file diff --git b/src/test/java/com/medical/framework/ZteitsDailySystemApplicationTests.java a/src/test/java/com/medical/framework/ZteitsDailySystemApplicationTests.java new file mode 100644 index 0000000..b288127 --- /dev/null +++ a/src/test/java/com/medical/framework/ZteitsDailySystemApplicationTests.java @@ -0,0 +1,16 @@ +package com.medical.framework; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +@RunWith(SpringRunner.class) +@SpringBootTest +public class ZteitsDailySystemApplicationTests { + + @Test + public void contextLoads() { + } + +}