From 0e471d20a3228d438dea958ce0b29e3db8b54ef0 Mon Sep 17 00:00:00 2001
From: lvleigang <957075182@qq.com>
Date: Fri, 13 Sep 2024 09:45:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../plugin/MdmModulePluginInitializer.java          | 13 +++++++++++++
 buildpackage/src/main/resources/application.yml     |  2 +-
 pom.xml                                             |  4 +++-
 service/pom.xml                                     |  8 --------
 .../frame/mdm/mdmModule/entity/MdmModuleEntity.xml  |  8 ++++----
 webapp/pom.xml                                      | 10 ++++++++++
 6 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/mdmDistribute/plugin/MdmModulePluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/mdmDistribute/plugin/MdmModulePluginInitializer.java
index ebff9dc2..2ee48f35 100644
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/mdmDistribute/plugin/MdmModulePluginInitializer.java
+++ b/buildpackage/src/main/java/com/hzya/frame/plugin/mdmDistribute/plugin/MdmModulePluginInitializer.java
@@ -32,6 +32,8 @@ import com.hzya.frame.sysnew.application.script.entity.SysApplicationScriptEntit
 import com.hzya.frame.sysnew.grovy.service.IGroovyIntegrationService;
 import com.hzya.frame.sysnew.integtationTaskLivingDetails.entity.IntegrationTaskLivingDetailsEntity;
 import com.hzya.frame.sysnew.integtationTaskLivingDetails.service.IIntegrationTaskLivingDetailsService;
+import com.hzya.frame.testCbs.service.ITsetCbsService;
+import com.hzya.frame.testU8c.service.ITsetU8cService;
 import com.hzya.frame.uuid.UUIDUtils;
 import com.hzya.frame.web.entity.BaseResult;
 import com.hzya.frame.web.entity.JsonResultEntity;
@@ -117,9 +119,17 @@ public class MdmModulePluginInitializer extends PluginBaseEntity {
     public String getPluginType() {
         return "1";
     }
+    @Resource
+    private ITsetCbsService tsetCbsService;
+    @Resource
+    private ITsetU8cService tsetU8cService;
 
     @Override
     public JsonResultEntity executeBusiness(JSONObject requestJson) {
+
+        tsetCbsService.testCbs(new JSONObject());
+        tsetU8cService.testU8c(new JSONObject());
+        requestJson = null;
         try{
             //重试方法
             if (null != requestJson) {
@@ -1484,4 +1494,7 @@ public class MdmModulePluginInitializer extends PluginBaseEntity {
         }
         return jsonObjects;
     }
+
+
+
 }
diff --git a/buildpackage/src/main/resources/application.yml b/buildpackage/src/main/resources/application.yml
index be68b2f0..7b481a9d 100644
--- a/buildpackage/src/main/resources/application.yml
+++ b/buildpackage/src/main/resources/application.yml
@@ -125,4 +125,4 @@ jeecg :
     minio_pass: ??
     bucketName: ??
 data:
-  use: false
+  use: true
diff --git a/pom.xml b/pom.xml
index d7c2e49a..b0f603d2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,6 +4,8 @@
     <modules>
         <module>buildpackage</module>
         <module>service</module>
+        <module>cbs</module>
+        <module>u8c</module>
         <module>common</module>
         <module>webapp</module>
         <module>core</module>
@@ -450,7 +452,7 @@
                 <configuration>
                     <webResources>
                         <resource>
-                            <directory>${basedir}/../service/src/main/resources/lib</directory>
+                            <directory>${basedir}/../service/src/main/webapp/WEB-INF/lib</directory>
                             <targetPath>WEB-INF/lib/</targetPath>
                             <filtering>false</filtering>
                             <includes>
diff --git a/service/pom.xml b/service/pom.xml
index 84315e0a..e9400c2a 100644
--- a/service/pom.xml
+++ b/service/pom.xml
@@ -22,14 +22,6 @@
             <version>${mysql-connector-java}</version>
         </dependency>
 
-<!--        service下的lib 写法-->
-<!--        <dependency>-->
-<!--            <groupId>com.hzya.openBasicSDK</groupId>-->
-<!--            <artifactId>openBasicSDK</artifactId>-->
-<!--            <version>1</version>-->
-<!--            <scope>system</scope>-->
-<!--            <systemPath>${basedir}/src/main/resources/lib/openBasicSDK-2.1.230630.jar</systemPath>-->
-<!--        </dependency>-->
     </dependencies>
     <build>
         <plugins>
diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModule/entity/MdmModuleEntity.xml b/service/src/main/java/com/hzya/frame/mdm/mdmModule/entity/MdmModuleEntity.xml
index d9571819..629067a8 100644
--- a/service/src/main/java/com/hzya/frame/mdm/mdmModule/entity/MdmModuleEntity.xml
+++ b/service/src/main/java/com/hzya/frame/mdm/mdmModule/entity/MdmModuleEntity.xml
@@ -985,20 +985,20 @@ where id = #{id}
                         <when test="item.connectionSymbol == '1'.toString() ">
                             <choose>
                                 <when test="item.rightParenthesis == ')'.toString() ">
-                                    ${item.rightParenthesis} and
+                                    ${item.rightParenthesis}
                                 </when>
                                 <otherwise>
-                                    ${item.rightParenthesis}
+                                    ${item.rightParenthesis} and
                                 </otherwise>
                             </choose>
                         </when>
                         <when test="item.connectionSymbol == '2'.toString() ">
                             <choose>
                                 <when test="item.rightParenthesis == ')'.toString() ">
-                                    ${item.rightParenthesis} or
+                                    ${item.rightParenthesis}
                                 </when>
                                 <otherwise>
-                                    ${item.rightParenthesis}
+                                    ${item.rightParenthesis} or
                                 </otherwise>
                             </choose>
                         </when>
diff --git a/webapp/pom.xml b/webapp/pom.xml
index 4db047f7..d62c3192 100644
--- a/webapp/pom.xml
+++ b/webapp/pom.xml
@@ -16,6 +16,16 @@
             <artifactId>service</artifactId>
             <version>${revision}</version>
         </dependency>
+        <dependency>
+            <groupId>com.hzya.frame</groupId>
+            <artifactId>cbs</artifactId>
+            <version>${revision}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.hzya.frame</groupId>
+            <artifactId>u8c</artifactId>
+            <version>${revision}</version>
+        </dependency>
     </dependencies>
     <build>
         <plugins>