Merge remote-tracking branch 'origin/master'

anrui-flowable/anrui-flowable-api/pom.xml

@@ -47,5 +47,16 @@
 
     </dependencies>
 
+    <distributionManagement>
+        <repository>
+            <id>nexus-releases</id>
+            <url>http://nexus3.yyundong.com/repository/yxt-mvn-releases/</url>
+        </repository>
+        <snapshotRepository>
+            <id>nexus-snapshots</id>
+            <url>http://nexus3.yyundong.com/repository/yxt-mvn-snapshot/</url>
+        </snapshotRepository>
+    </distributionManagement>
+
 
 </project>

anrui-flowable/anrui-flowable-biz/src/main/resources/application-test.yml

@@ -1,11 +1,23 @@
 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://39.104.142.192:3306/flowable?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true
+    url: jdbc:mysql://172.18.0.4:3306/flowable?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true
     username: root
-    password: 123456
+    password: yxt_mysql_138
   cloud:
     nacos:
       discovery:
-        server-addr: 127.0.0.1:8848
+        server-addr: 172.18.0.5:8848
+  redis:
+    database: 3  # Redis数据库索引（默认为0）
+    host: 172.18.0.7
+    jedis:
+      pool:
+        max-active: -1  #连接池最大连接数（使用负值表示没有限制）
+        max-idle: 8  #连接池中的最大空闲连接
+        max-wait: -1   # 连接池最大阻塞等待时间（使用负值表示没有限制）
+        min-idle: 0  # 连接池中的最小空闲连接
+    password:
+    port: 6379
+    timeout: 0  # 连接超时时间（毫秒）
 

anrui-portal/anrui-portal-api/pom.xml

@@ -46,5 +46,16 @@
         </dependency>
     </dependencies>
 
+    <distributionManagement>
+        <repository>
+            <id>nexus-releases</id>
+            <url>http://nexus3.yyundong.com/repository/yxt-mvn-releases/</url>
+        </repository>
+        <snapshotRepository>
+            <id>nexus-snapshots</id>
+            <url>http://nexus3.yyundong.com/repository/yxt-mvn-snapshot/</url>
+        </snapshotRepository>
+    </distributionManagement>
+
 
 </project>

anrui-portal/anrui-portal-biz/src/main/resources/application-test.yml

@@ -1,16 +1,16 @@
 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://39.104.142.192:3306/anrui_portal?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true
+    url: jdbc:mysql://172.18.0.4:3306/anrui_portal?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true
     username: root
-    password: 123456
+    password: yxt_mysql_138
   cloud:
     nacos:
       discovery:
-        server-addr: 127.0.0.1:8848
+        server-addr: 172.18.0.5:8848
   redis:
     database: 3  # Redis数据库索引（默认为0）
-    host: 127.0.0.1
+    host: 172.18.0.7
     jedis:
       pool:
         max-active: -1  #连接池最大连接数（使用负值表示没有限制）

anrui-riskcenter/anrui-riskcenter-api/pom.xml

@@ -32,5 +32,16 @@
 
     </dependencies>
 
+    <distributionManagement>
+        <repository>
+            <id>nexus-releases</id>
+            <url>http://nexus3.yyundong.com/repository/yxt-mvn-releases/</url>
+        </repository>
+        <snapshotRepository>
+            <id>nexus-snapshots</id>
+            <url>http://nexus3.yyundong.com/repository/yxt-mvn-snapshot/</url>
+        </snapshotRepository>
+    </distributionManagement>
+
 
 </project>

anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/application-test.yml

@@ -1,16 +1,16 @@
 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://39.104.142.192:3306/anrui_business?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true
+    url: jdbc:mysql://172.18.0.4:3306/anrui_business?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true
     username: root
-    password: 123456
+    password: yxt_mysql_138
   cloud:
     nacos:
       discovery:
-        server-addr: 127.0.0.1:8848
+        server-addr: 172.18.0.5:8848
   redis:
     database: 3  # Redis数据库索引（默认为0）
-    host: 127.0.0.1
+    host: 172.18.0.7
     jedis:
       pool:
         max-active: -1  #连接池最大连接数（使用负值表示没有限制）

anrui-scm/anrui-scm-api/pom.xml

@@ -31,4 +31,15 @@
         </dependency>
     </dependencies>
 
+    <distributionManagement>
+        <repository>
+            <id>nexus-releases</id>
+            <url>http://nexus3.yyundong.com/repository/yxt-mvn-releases/</url>
+        </repository>
+        <snapshotRepository>
+            <id>nexus-snapshots</id>
+            <url>http://nexus3.yyundong.com/repository/yxt-mvn-snapshot/</url>
+        </snapshotRepository>
+    </distributionManagement>
+
 </project>

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java

@@ -247,15 +247,7 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn
                 baseVehicleDto.setVehicleStateValue(VehicleState.StockEnum.RETURNING_STOCK.getRemarks());
                 baseVehicleDtos.add(baseVehicleDto);
             }
-            /*baseVehicleUpdateQuery.setVinNoLis(strings);
-            baseVehicleUpdateQuery.setVehicleState("0003");
-            baseVehicleUpdateQuery.setVihicleStateValue("采购退库中");
-            baseVehicleFeign.updateByVinNo(baseVehicleUpdateQuery);*/
             baseVehicleFeign.saveOrUpdate(baseVehicleDtos, OperVehicleState.EventType.UPDATE_VEHICLE.getCode());
-
-            /*ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv);
-            UpdateFlowFieldVo ufVo = voResultBean.getData();
-            updateFlowFiled(BeanUtil.beanToMap(ufVo));*/
             //极光推送
             ScmVehicleReturn scmVehicleReturn = fetchBySid(businessSid);
             MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
@@ -297,15 +289,15 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn
             ResultBean<UpdateFlowFieldVo> resultBean1 = flowableFeign.startProcess(bv);
             UpdateFlowFieldVo uff = resultBean1.getData();
             updateFlowFiled(BeanUtil.beanToMap(uff));
-            BaseVehicleUpdateQuery baseVehicleUpdateQuery = new BaseVehicleUpdateQuery();
+            List<BaseVehicleDto> baseVehicleDtos = new ArrayList<>();
-            List<String> strings = new ArrayList<>();
             for (ScmVehicleReturnDetailsDto scmVehicleReturnDetailsDto : detailsList) {
-                strings.add(scmVehicleReturnDetailsDto.getVinNo());
+                BaseVehicleDto baseVehicleDto = new BaseVehicleDto();
+                baseVehicleDto.setVinNo(scmVehicleReturnDetailsDto.getVinNo());
+                baseVehicleDto.setVehicleState(VehicleState.StockEnum.RETURNING_STOCK.getCode());
+                baseVehicleDto.setVehicleStateValue(VehicleState.StockEnum.RETURNING_STOCK.getRemarks());
+                baseVehicleDtos.add(baseVehicleDto);
             }
-            baseVehicleUpdateQuery.setVinNoLis(strings);
+            baseVehicleFeign.saveOrUpdate(baseVehicleDtos, OperVehicleState.EventType.UPDATE_VEHICLE.getCode());
-            baseVehicleUpdateQuery.setVehicleState("0003");
-            baseVehicleUpdateQuery.setVihicleStateValue("采购退库中");
-            baseVehicleFeign.updateByVinNo(baseVehicleUpdateQuery);
             //极光推送
             ScmVehicleReturn scmVehicleReturn = fetchBySid(businessSid);
             MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();

anrui-scm/anrui-scm-biz/src/main/resources/application-test.yml

@@ -0,0 +1,26 @@
+spring:
+  datasource:
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    url: jdbc:mysql://172.18.0.4:3306/anrui_scm?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
+    username: root
+    password: yxt_mysql_138
+  nacos:
+    discovery:
+      server-addr: 172.18.0.5:8848
+  redis:
+    database: 6  # Redis数据库索引（默认为0）
+    host: 172.18.0.7
+    jedis:
+      pool:
+        max-active: -1  #连接池最大连接数（使用负值表示没有限制）
+        max-idle: 8  #连接池中的最大空闲连接
+        max-wait: -1   # 连接池最大阻塞等待时间（使用负值表示没有限制）
+        min-idle: 0  # 连接池中的最小空闲连接
+    password:
+    port: 6379
+    timeout: 0  # 连接超时时间（毫秒）
+image:
+  upload:
+    path: static/upload/
+  url:
+    prefix: http://127.0.0.1:8080/upload/