Sfoglia il codice sorgente

修改打包方式,解决不能自动生成Qqueysql的代码

lijie 3 anni fa
parent
commit
701e3c16cf

+ 7 - 0
dmp-dic/pom.xml

@@ -73,6 +73,13 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-amqp</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.sun</groupId>
+            <artifactId>tools</artifactId>
+            <version>${java.version}</version>
+            <scope>system</scope>
+            <systemPath>${env.JAVA_HOME}/lib/tools.jar</systemPath>
+        </dependency>
     </dependencies>
 
     <build>

+ 34 - 5
dmp-rwd/pom.xml

@@ -8,8 +8,7 @@
         <version>4.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-
-    <groupId>com.persagy</groupId>
+    <!--<groupId>com.persagy</groupId>-->
     <artifactId>dmp-rwd</artifactId>
 
     <dependencies>
@@ -43,11 +42,21 @@
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>druid</artifactId>
-            <version>1.1.21</version>
+            <version>1.1.20</version>
         </dependency>
         <dependency>
             <groupId>com.querydsl</groupId>
             <artifactId>querydsl-apt</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>guava</artifactId>
+                    <groupId>com.google.guava</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>javassist</artifactId>
+                    <groupId>org.javassist</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.querydsl</groupId>
@@ -67,15 +76,21 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
         </dependency>
-        <dependency>
+        <!--<dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
+        </dependency>-->
 
         <!-- 注册中心 -->
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>guava</artifactId>
+                    <groupId>com.google.guava</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <!-- 配置中心 -->
         <dependency>
@@ -92,6 +107,19 @@
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-openfeign</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>HdrHistogram</artifactId>
+                    <groupId>org.hdrhistogram</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>com.sun</groupId>
+            <artifactId>tools</artifactId>
+            <version>${java.version}</version>
+            <scope>system</scope>
+            <systemPath>${env.JAVA_HOME}/lib/tools.jar</systemPath>
         </dependency>
     </dependencies>
 
@@ -179,6 +207,7 @@
                     </execution>
                 </executions>
             </plugin>
+
             <!-- 按照测试要求打成zip需要的配置 -->
             <!--获取git信息-->
             <plugin>

+ 3 - 3
dmp-rwd/src/main/java/com/persagy/dmp/rwd/config/JpaSqlExecuteContext.java

@@ -18,18 +18,18 @@ public class JpaSqlExecuteContext extends HandlerInterceptorAdapter {
 
 	@Override
 	public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
-		this.init(request.getParameter("groupCode"), request.getParameter("projectId"));
+		init(request.getParameter("groupCode"), request.getParameter("projectId"));
 		return true;
 	}
 
 	@Override
 	public void postHandle(HttpServletRequest request, HttpServletResponse response, Object handler, ModelAndView modelAndView) throws Exception {
-		this.clear();
+		clear();
 	}
 
 	@Override
 	public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) throws Exception {
-		this.clear();
+		clear();
 	}
 
 

+ 0 - 1
dmp-rwd/src/main/java/com/persagy/dmp/rwd/entity/GraphInstance.java

@@ -5,7 +5,6 @@ import com.persagy.dmp.rwd.model.GraphInstanceModel;
 import com.vladmihalcea.hibernate.type.json.JsonStringType;
 import lombok.Getter;
 import lombok.Setter;
-import org.hibernate.annotations.GenericGenerator;
 import org.hibernate.annotations.Type;
 import org.hibernate.annotations.TypeDef;
 

+ 6 - 6
dmp-rwd/src/main/java/com/persagy/dmp/rwd/service/InitService.java

@@ -50,22 +50,22 @@ public class InitService extends BaseService {
 			// 创建信息点表
 			sql = getCreateGroupFuncidSql(groupCode);
 			statement.executeUpdate(sql);
-
+			// 创建方案表
 			sql = getCreateSchemaSql(groupCode);
 			statement.executeUpdate(sql);
-
+			// 创建方案类型表
 			sql = getCreateSchemaClassSql(groupCode);
 			statement.executeUpdate(sql);
-
+			// 创建方案信息点表
 			sql = getCreateSchemaFuncidSql(groupCode);
 			statement.executeUpdate(sql);
-
+			// 创建集团方案表
 			sql = getCreateSchemaProjectSql(groupCode);
 			statement.executeUpdate(sql);
-
+			// 创建应用方案表
 			sql = getCreateAppClassSql(groupCode);
 			statement.executeUpdate(sql);
-
+			// 创建应用信息点表
 			sql = getCreateAppFuncidSql(groupCode);
 			statement.executeUpdate(sql);
 		} catch (SQLException e) {