Skip to content

E
EIP-API
提交 c1c9aed8 authored 作者: Wangjiajie's avatar Wangjiajie
浏览文件
操作

更改动态sql

上级 c953be93
隐藏空白字符变更
内嵌 并排
正在显示 包含 33 行增加 和 509 行删除
jeecg-boot-base-api/jeecg-system-local-api/target/classes/META-INF/MANIFEST.MF deleted 100644 → 0
浏览文件 @ c953be93
Manifest-Version: 1.0
Implementation-Title: jeecg-system-local-api
Implementation-Version: 2.3.0
Built-By: hectorli
Implementation-Vendor-Id: org.jeecgframework.boot
Build-Jdk: 1.8.0_212
Implementation-URL: https://projects.spring.io/spring-boot/#/spring-bo
ot-starter-parent/jeecg-boot-parent/jeecg-boot-base-api/jeecg-system-
local-api
Created-By: Maven Integration for Eclipse
jeecg-boot-base-api/jeecg-system-local-api/target/classes/META-INF/maven/org.jeecgframework.boot/jeecg-system-local-api/pom.properties deleted 100644 → 0
浏览文件 @ c953be93
#Generated by Maven Integration for Eclipse
#Sun May 16 15:43:59 HKT 2021
version=2.3.0
groupId=org.jeecgframework.boot
m2e.projectName=jeecg-system-local-api
m2e.projectLocation=/source/jeecg-boot/jeecg-boot/jeecg-boot-base-api/jeecg-system-local-api
artifactId=jeecg-system-local-api
jeecg-boot-base-api/jeecg-system-local-api/target/classes/META-INF/maven/org.jeecgframework.boot/jeecg-system-local-api/pom.xml deleted 100644 → 0
浏览文件 @ c953be93
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>jeecg-boot-base-api</artifactId>
<groupId>org.jeecgframework.boot</groupId>
<version>2.3.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jeecg-system-local-api</artifactId>
</project>
\ No newline at end of file
jeecg-boot-base-common/src/main/java/org/jeecg/common/aspect/DictAspect.java
浏览文件 @ c1c9aed8
......@@ -146,8 +146,7 @@ public class DictAspect {
}
if (!StringUtils.isEmpty(table)){
log.debug("--DictAspect------dicTable="+ table+" ,dicText= "+text+" ,dicCode="+code);
//tmpValue= commonAPI.translateDictFromTable(table,text,code,k.trim());
tmpValue = "select "+text+" from "+table+" where 1=1" +((code != "" && code!=null)?" and "+code+" = " +k.trim(): "");
tmpValue= commonAPI.translateDictFromTable(table,text,code,k.trim());
}else {
tmpValue = commonAPI.translateDict(code, k.trim());
}
......
jeecg-boot-base-common/target/classes/META-INF/MANIFEST.MF deleted 100644 → 0
浏览文件 @ c953be93
Manifest-Version: 1.0
Implementation-Title: jeecg-boot-base-common
Implementation-Version: 2.3.0
Built-By: hectorli
Implementation-Vendor-Id: org.jeecgframework.boot
Build-Jdk: 1.8.0_212
Implementation-URL: https://projects.spring.io/spring-boot/#/spring-bo
ot-starter-parent/jeecg-boot-parent/jeecg-boot-base-common
Created-By: Maven Integration for Eclipse
jeecg-boot-base-common/target/classes/META-INF/maven/org.jeecgframework.boot/jeecg-boot-base-common/pom.properties deleted 100644 → 0
浏览文件 @ c953be93
#Generated by Maven Integration for Eclipse
#Sun May 16 15:43:51 HKT 2021
version=2.3.0
groupId=org.jeecgframework.boot
m2e.projectName=jeecg-boot-base-common
m2e.projectLocation=/source/jeecg-boot/jeecg-boot/jeecg-boot-base-common
artifactId=jeecg-boot-base-common
jeecg-boot-base-common/target/classes/META-INF/maven/org.jeecgframework.boot/jeecg-boot-base-common/pom.xml deleted 100644 → 0
浏览文件 @ c953be93
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.jeecgframework.boot</groupId>
<artifactId>jeecg-boot-parent</artifactId>
<version>2.3.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jeecg-boot-base-common</artifactId>
<repositories>
<repository>
<id>aliyun</id>
<name>aliyun Repository</name>
<url>http://maven.aliyun.com/nexus/content/groups/public</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
<repository>
<id>jeecg</id>
<name>jeecg Repository</name>
<url>http://maven.jeecg.org/nexus/content/repositories/jeecg</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
</repositories>
<properties>
<java.version>1.8</java.version>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<mybatis-plus.version>3.3.2</mybatis-plus.version>
<druid.version>1.1.17</druid.version>
<jwt.version>0.9.1</jwt.version>
<commons.version>2.6</commons.version>
<aliyun-java-sdk-dysmsapi.version>1.0.0</aliyun-java-sdk-dysmsapi.version>
<aliyun.oss.version>3.6.0</aliyun.oss.version>
<guava.version>26.0-jre</guava.version>
</properties>
<dependencies>
<!--集成springmvc框架并实现自动配置 -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<!-- websocket -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-websocket</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-mail</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-aop</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>
</dependency>
<!-- commons -->
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>${commons.version}</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>${commons.version}</version>
</dependency>
<!-- freemarker -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-freemarker</artifactId>
</dependency>
<!-- mybatis-plus -->
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-boot-starter</artifactId>
<version>${mybatis-plus.version}</version>
</dependency>
<!-- druid -->
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>druid-spring-boot-starter</artifactId>
<version>${druid.version}</version>
</dependency>
<!-- 动态数据源 -->
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>dynamic-datasource-spring-boot-starter</artifactId>
<version>2.5.4</version>
</dependency>
<!--mysql-->
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>8.0.20</version>
<scope>runtime</scope>
</dependency>
<!-- sqlserver-->
<dependency>
<groupId>com.microsoft.sqlserver</groupId>
<artifactId>sqljdbc4</artifactId>
<version>4.0</version>
</dependency>
<!-- oracle驱动 -->
<dependency>
<groupId>com.oracle</groupId>
<artifactId>ojdbc6</artifactId>
<version>11.2.0.3</version>
<scope>runtime</scope>
</dependency>
<!-- postgresql驱动 -->
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>42.2.6</version>
<scope>runtime</scope>
</dependency>
<!-- Quartz定时任务 -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-quartz</artifactId>
</dependency>
<!--JWT-->
<dependency>
<groupId>com.auth0</groupId>
<artifactId>java-jwt</artifactId>
<version>3.7.0</version>
</dependency>
<!--shiro-->
<dependency>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-spring-boot-starter</artifactId>
<version>1.5.3</version>
</dependency>
<!-- shiro-redis -->
<dependency>
<groupId>org.crazycake</groupId>
<artifactId>shiro-redis</artifactId>
<version>3.1.0</version>
<exclusions>
<exclusion>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-core</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-re</artifactId>
<version>2.3.01</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
<exclusions>
<exclusion>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- Swagger API文档 -->
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId>
<version>2.9.2</version>
<exclusions>
<exclusion>
<groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId>
</exclusion>
<exclusion>
<groupId>io.swagger</groupId>
<artifactId>swagger-models</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger-ui</artifactId>
<version>2.9.2</version>
</dependency>
<dependency>
<groupId>com.github.xiaoymin</groupId>
<artifactId>swagger-bootstrap-ui</artifactId>
<version>1.9.6</version>
</dependency>
<!-- # 增加两个配置解决 NumberFormatException -->
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId>
<version>1.5.22</version>
</dependency>
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-models</artifactId>
<version>1.5.22</version>
</dependency>
<!-- Redis -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-redis</artifactId>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-pool2</artifactId>
</dependency>
<!-- 代码生成器 -->
<!-- 如下载失败，请参考此文档 http://doc.jeecg.com/1273965 -->
<dependency>
<groupId>org.jeecgframework.boot</groupId>
<artifactId>codegenerate</artifactId>
<version>1.2.2</version>
</dependency>
<!-- AutoPoi Excel工具类-->
<dependency>
<groupId>org.jeecgframework</groupId>
<artifactId>autopoi-web</artifactId>
<version>1.2.1</version>
<exclusions>
<exclusion>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-all</artifactId>
<version>5.3.8</version>
</dependency>
<!-- mini文件存储服务 -->
<dependency>
<groupId>io.minio</groupId>
<artifactId>minio</artifactId>
<version>4.0.0</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${guava.version}</version>
</dependency>
<!-- 阿里云短信 -->
<dependency>
<groupId>com.aliyun</groupId>
<artifactId>aliyun-java-sdk-dysmsapi</artifactId>
<version>${aliyun-java-sdk-dysmsapi.version}</version>
</dependency>
<!-- aliyun oss -->
<dependency>
<groupId>com.aliyun.oss</groupId>
<artifactId>aliyun-sdk-oss</artifactId>
<version>${aliyun.oss.version}</version>
</dependency>
<!-- 第三方登录 -->
<dependency>
<groupId>com.xkcoding.justauth</groupId>
<artifactId>justauth-spring-boot-starter</artifactId>
<version>1.3.2</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
jeecg-boot-module-demo/target/classes/META-INF/MANIFEST.MF deleted 100644 → 0
浏览文件 @ c953be93
Manifest-Version: 1.0
Implementation-Title: jeecg-boot-module-demo
Implementation-Version: 2.3.0
Built-By: hectorli
Implementation-Vendor-Id: org.jeecgframework.boot
Build-Jdk: 1.8.0_212
Implementation-URL: https://projects.spring.io/spring-boot/#/spring-bo
ot-starter-parent/jeecg-boot-parent/jeecg-boot-module-demo
Created-By: Maven Integration for Eclipse
jeecg-boot-module-demo/target/classes/META-INF/maven/org.jeecgframework.boot/jeecg-boot-module-demo/pom.properties deleted 100644 → 0
浏览文件 @ c953be93
#Generated by Maven Integration for Eclipse
#Sun May 16 15:44:01 HKT 2021
version=2.3.0
groupId=org.jeecgframework.boot
m2e.projectName=jeecg-boot-module-demo
m2e.projectLocation=/source/jeecg-boot/jeecg-boot/jeecg-boot-module-demo
artifactId=jeecg-boot-module-demo
jeecg-boot-module-demo/target/classes/META-INF/maven/org.jeecgframework.boot/jeecg-boot-module-demo/pom.xml deleted 100644 → 0
浏览文件 @ c953be93
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>jeecg-boot-parent</artifactId>
<groupId>org.jeecgframework.boot</groupId>
<version>2.3.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jeecg-boot-module-demo</artifactId>
<dependencies>
<dependency>
<groupId>org.jeecgframework.boot</groupId>
<artifactId>jeecg-boot-base-common</artifactId>
</dependency>
<dependency>
<groupId>org.jeecgframework.boot</groupId>
<artifactId>jeecg-system-local-api</artifactId>
</dependency>
</dependencies>
</project>
\ No newline at end of file
jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/basedata/entity/IostPrice.java
浏览文件 @ c1c9aed8
package org.jeecg.modules.iost.basedata.entity;
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
......
jeecg-boot-module-system/src/main/resources/application-docker.yml
浏览文件 @ c1c9aed8
server:
7server:
port: 8080
tomcat:
max-swallow-size: -1
......
jeecg-boot-module-system/src/main/resources/application-test.yml
浏览文件 @ c1c9aed8
......@@ -3,7 +3,7 @@ server:
tomcat:
max-swallow-size: -1
servlet:
context-path: /jeecg-boot
context-path: /wmssystem
compression:
enabled: true
min-response-size: 1024
......@@ -127,7 +127,7 @@ spring:
connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
datasource:
master:
url: jdbc:mysql://127.0.0.1:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
url: jdbc:mysql://127.0.0.1:3306/wmssystem?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
username: root
password: root
driver-class-name: com.mysql.cj.jdbc.Driver
......@@ -140,7 +140,7 @@ spring:
#redis 配置
redis:
database: 0
host: 192.168.1.199
host: 127.0.0.1
lettuce:
pool:
max-active: 8 #最大连接数据库连接数,设 0 为没有限制
......
jeecg-boot-module-system/src/main/resources/application.yml
浏览文件 @ c1c9aed8
spring:
profiles:
active: docker
active: test
swagger:
production: false
basic:
......
jeecg-boot-module-system/target/classes/META-INF/MANIFEST.MF deleted 100644 → 0
浏览文件 @ c953be93
Manifest-Version: 1.0
Implementation-Title: jeecg-boot-module-system
Implementation-Version: 2.3.0
Built-By: hectorli
Implementation-Vendor-Id: org.jeecgframework.boot
Build-Jdk: 1.8.0_212
Implementation-URL: https://projects.spring.io/spring-boot/#/spring-bo
ot-starter-parent/jeecg-boot-parent/jeecg-boot-module-system
Created-By: Maven Integration for Eclipse
jeecg-boot-module-system/target/classes/META-INF/maven/org.jeecgframework.boot/jeecg-boot-module-system/pom.properties deleted 100644 → 0
浏览文件 @ c953be93
#Generated by Maven Integration for Eclipse
#Sun May 16 15:44:07 HKT 2021
version=2.3.0
groupId=org.jeecgframework.boot
m2e.projectName=jeecg-boot-module-system
m2e.projectLocation=/source/jeecg-boot/jeecg-boot/jeecg-boot-module-system
artifactId=jeecg-boot-module-system
jeecg-boot-module-system/target/classes/META-INF/maven/org.jeecgframework.boot/jeecg-boot-module-system/pom.xml deleted 100644 → 0
浏览文件 @ c953be93
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.jeecgframework.boot</groupId>
<artifactId>jeecg-boot-parent</artifactId>
<version>2.3.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jeecg-boot-module-system</artifactId>
<repositories>
<repository>
<id>aliyun</id>
<name>aliyun Repository</name>
<url>http://maven.aliyun.com/nexus/content/groups/public</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
<repository>
<id>jeecg</id>
<name>jeecg Repository</name>
<url>http://maven.jeecg.org/nexus/content/repositories/jeecg</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
</repositories>
<dependencies>
<!-- jeecg base api -->
<dependency>
<groupId>org.jeecgframework.boot</groupId>
<artifactId>jeecg-system-local-api</artifactId>
</dependency>
<dependency>
<groupId>org.jeecgframework.boot</groupId>
<artifactId>jeecg-boot-module-demo</artifactId>
<version>${jeecgboot.version}</version>
</dependency>
<!-- pdf -->
<dependency>
<groupId>com.itextpdf</groupId>
<artifactId>itext-asian</artifactId>
<version>5.2.0</version>
</dependency>
<dependency>
<groupId>com.itextpdf</groupId>
<artifactId>itextpdf</artifactId>
<version>5.4.3</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>com.github.wvengen</groupId>
<artifactId>proguard-maven-plugin</artifactId>
<executions>
<execution>
<phase>package</phase>
<goals><goal>proguard</goal></goals>
</execution>
</executions>
<configuration>
<proguardVersion>6.1.0beta1</proguardVersion>
<injar>classes</injar>
<outjar>wmssystem.jar</outjar>
<obfuscate>true</obfuscate>
<proguardInclude>proguard.conf</proguardInclude>
</configuration>
<dependencies>
<dependency>
<groupId>net.sf.proguard</groupId>
<artifactId>proguard-base</artifactId>
<version>6.1.0beta1</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
</project>
\ No newline at end of file
jeecg-boot-module-system/target/classes/application-docker.yml
浏览文件 @ c1c9aed8
server:
7server:
port: 8080
tomcat:
max-swallow-size: -1
......
jeecg-boot-module-system/target/classes/application-test.yml
浏览文件 @ c1c9aed8
......@@ -3,7 +3,7 @@ server:
tomcat:
max-swallow-size: -1
servlet:
context-path: /jeecg-boot
context-path: /wmssystem
compression:
enabled: true
min-response-size: 1024
......@@ -127,7 +127,7 @@ spring:
connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
datasource:
master:
url: jdbc:mysql://127.0.0.1:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
url: jdbc:mysql://127.0.0.1:3306/wmssystem?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
username: root
password: root
driver-class-name: com.mysql.cj.jdbc.Driver
......@@ -140,7 +140,7 @@ spring:
#redis 配置
redis:
database: 0
host: 192.168.1.199
host: 127.0.0.1
lettuce:
pool:
max-active: 8 #最大连接数据库连接数,设 0 为没有限制
......
jeecg-boot-module-system/target/classes/application.yml
浏览文件 @ c1c9aed8
spring:
profiles:
active: docker
active: test
swagger:
production: false
basic:
......
jeecg-boot-module-system/target/classes/org/jeecg/modules/iost/basedata/mapper/xml/IostDeliveryRecordPageMapper.xml 0 → 100644
浏览文件 @ c1c9aed8
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.iost.basedata.mapper.IostDeliveryRecordPageMapper">
<select id="selectlist" resultType="org.jeecg.modules.iost.basedata.vo.IostDeliveryRecordPage">
SELECT *
FROM iost_deliverstatus AS D,iost_deliverstatus_list AS L
<where>
<if test="iostDeliveryRecordPage.bulkNo !=null">
and bulk_no = iostDeliveryRecordPage.bulkNo
</if>
<if test="iostDeliveryRecordPage.containerNo !=null">
and container_no = iostDeliveryRecordPage.bulkNo
</if>
and D.id = L.deliverstatus_id
</where>
limit #{pageNo},#{pageSize}
</select>
</mapper>
\ No newline at end of file
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论