From 9a00280ba0915439a9a4e243341850bddb0990fc Mon Sep 17 00:00:00 2001
From: yinglong zhang <1679309912@qq.com>
Date: Wed, 7 Jul 2021 09:53:29 +0800
Subject: [PATCH] =?UTF-8?q?feat=20=E6=94=B9=E5=9B=9E=E6=B3=A8=E5=86=8C?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/adc/da/common/ActDefineStartMap.java  |  2 +-
 .../controller/WorkFlowController.java        |  2 +-
 .../main/resources/application-dev.properties | 23 +++++++++++--------
 .../mybatis/mapper/att/AttFileEOMapper.xml    |  2 +-
 4 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java b/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java
index c10bfcdd..388aba37 100644
--- a/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java
+++ b/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java
@@ -18,7 +18,7 @@ public class ActDefineStartMap {
         map.put("2","standardSurveyWorkFlow");
         map.put("3","standardCommentProcessWorkFlow");
 
-        map.put("3","standardregulatoryinventory");
+        map.put("4","standardregulatoryinventory");
         return map.get(type);
     }
 }
diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java
index b72e68c9..c6643978 100644
--- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java
+++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java
@@ -213,7 +213,7 @@ public class WorkFlowController {
 
     @ApiOperation(value = "完成任务")
     @PostMapping("/completeTask")
-    public  Wrapper<String> completeTaskByUserId(@RequestBody BusMes busMes){
+    public  Wrapper<String> completeTaskByUserId(BusMes busMes){
         Wrapper<String> str = workFlowFeignClient.completeTaskByUserId(busMes);
         if(str.getCode() == 500){
             str.setSuccess(false);
diff --git a/adc-da-main/src/main/resources/application-dev.properties b/adc-da-main/src/main/resources/application-dev.properties
index a916e2e4..f021e344 100644
--- a/adc-da-main/src/main/resources/application-dev.properties
+++ b/adc-da-main/src/main/resources/application-dev.properties
@@ -9,14 +9,14 @@ spring.datasource.password = root
 
 #==============================================
 # 应用设置
-spring.application.name=FotonLAWSSystem-zqazqazqa
+spring.application.name=FotonLAWSSystem
 application.code=20200101
 application.center=1
 #==============================================
 #Eruept
-eureka.client.allow-redirects=false
-eureka.client.register-with-eureka=false
-eureka.client.service-url.defaultZone=http://127.0.0.1:8671/eureka/
+eureka.client.allow-redirects=true
+eureka.client.register-with-eureka=true
+eureka.client.service-url.defaultZone=http://192.168.10.47:8761/eureka/
 
 #==============================================
 # 邮箱配置1
@@ -35,13 +35,16 @@ spring.mail.port=587
 # ==============================================
 # rabbitMQ
 # ==============================================
-spring.rabbitmq.host=rabbitmq-cluster-01.vs.test.geely.svc
-spring.rabbitmq.port=5672
-spring.rabbitmq.virtual-host=uat_pcms
-spring.rabbitmq.username=uat_pcms
-spring.rabbitmq.password=VxsBLL5bJruwzXfS
+#spring.rabbitmq.host=rabbitmq-cluster-01.vs.test.geely.svc
+#spring.rabbitmq.port=5672
+#spring.rabbitmq.virtual-host=uat_pcms
+#spring.rabbitmq.username=uat_pcms
+#spring.rabbitmq.password=VxsBLL5bJruwzXfS
 # spring.rabbitmq.publisher-confirms=true
-
+spring.rabbitmq.host=192.168.10.248
+spring.rabbitmq.port=5672
+spring.rabbitmq.username=ca
+spring.rabbitmq.password=cs986432
 # ==============================================
 # 文档存储路径指向
 # ==============================================
diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/att/AttFileEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/att/AttFileEOMapper.xml
index 04f4a809..ce248b14 100644
--- a/adc-da-sys/src/main/resources/mybatis/mapper/att/AttFileEOMapper.xml
+++ b/adc-da-sys/src/main/resources/mybatis/mapper/att/AttFileEOMapper.xml
@@ -35,7 +35,7 @@
   </update>
  
   <select id="existTable" parameterType="java.lang.String" resultType="java.lang.Integer">
-  		select count(*) from user_tables where table_name = #{tableName}
+  		select count(*) from information_schema.TABLES where table_name = #{tableName}
   </select>
  
   <!-- 查询条件 -->