Merge branch 'master' of https://gitee.com/antai-wuliu/ANTAI-API

src/main/java/com/steerinfo/dil/controller/TMSController.java

@@ -465,16 +465,18 @@ public class TMSController extends BaseRESTfulController {
         if (capacities.length != list.size()) {
             throw new Exception("车号不允许重复！");
         } else {
-            new Runnable() {
-                @Override
-                public void run() {
-                    Map<String, Object> capacityMap = new HashMap<>();
-                    capacityMap.put("capacities", capacities);
-                    capacityMap.put("userId", userId);
-                    capacityMap.put("userName", userName);
-                    rmsFeign.batchInsertCapacityTrain(capacityMap);
-                }
-            }.run();
+            try{
+                new Runnable() {
+                    @Override
+                    public void run() {
+                        Map<String, Object> capacityMap = new HashMap<>();
+                        capacityMap.put("capacities", capacities);
+                        capacityMap.put("userId", userId);
+                        capacityMap.put("userName", userName);
+                        rmsFeign.batchInsertCapacityTrain(capacityMap);
+                    }
+                }.run();
+            }catch (Exception e){e.printStackTrace();}
         }
         //新增AMS及TMS
         map.put("userId",userId);

src/main/resources/application-dev.yml

@@ -41,7 +41,7 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.90.214:8083}
   AmsFeign:
-    url: ${AMSFEIGN_URL:localhost:8079}
+    url: ${AMSFEIGN_URL:172.16.90.214:8079}
   BmsFeign:
     url: ${BMSFEIGN_URL:localhost:8078}
   TmsFeign:
@@ -51,7 +51,7 @@ openfeign:
   OMSFeign:
     url: ${OMSFEIGN_URL:localhost:8095}
   RmsFeign:
-    url: ${RMSFEIGN_URL:localhost:8060}
+    url: ${RMSFEIGN_URL:172.16.90.214:8060}
   IntegrationFeign:
     url: ${INTEGRATIONFEIGN_URL:localhost:8066}
   OTMSFeign:

src/main/resources/com/steerinfo/dil/mapper/UniversalMapper.xml

@@ -239,8 +239,6 @@
         select * from(
         select * from(
         select
-        MATERIAL_TYPE_ID "materialTypeId",
-        MATERIAL_TYPE_NAME "materialTypeName",
         MATERIAL_TYPE_ID "id",
         MATERIAL_TYPE_ID "value",
         MATERIAL_TYPE_NAME "label",
@@ -256,23 +254,12 @@
             <if test="remark!=null and remark!=''">
                 AND REGEXP_LIKE("remark", #{remark})
             </if>
-            <if test="materialTypeId!=null and materialTypeId!=''">
-                AND "materialTypeId" =  #{materialTypeId}
-            </if>
-           <if test="id!=null and id.size>0 and !(index!=null and index!='')">
-                AND "id" in
-                <foreach collection="id" item="item"  open="(" close=")" separator="," >
-                    #{item}
-                </foreach>
-            </if>
         </where>
         FETCH NEXT 10 ROWS ONLY
         )
         <if test="id!=null and id.size>0">
         UNION
             select
-            MATERIAL_TYPE_ID "materialTypeId",
-            MATERIAL_TYPE_NAME "materialTypeName",
             MATERIAL_TYPE_ID "id",
             MATERIAL_TYPE_ID "value",
             MATERIAL_TYPE_NAME "label",
@@ -664,15 +651,13 @@
     <select id="getMaterialByLike" resultType="java.util.Map">
         select * from(
         select
-        RC.MATERIAL_ID "materialId",
-        RC.MATERIAL_NAME "materialName",
         RC.MATERIAL_ID "id",
         RC.MATERIAL_ID "value",
         RC.MATERIAL_NAME "label",
         RC.MATERIAL_NAME "text"
         from RMS_MATERIAL RC
-        where DELETED = 0
         <where>
+            DELETED = 0
             <if test="index!=null and index!=''">
                 AND REGEXP_LIKE(RC.MATERIAL_NAME, #{index})
             </if>
@@ -682,8 +667,6 @@
         <if test="id!=null and id.size>0">
         UNION
             select
-            RC.MATERIAL_ID "materialId",
-            RC.MATERIAL_NAME "materialName",
             RC.MATERIAL_ID "id",
             RC.MATERIAL_ID "value",
             RC.MATERIAL_NAME "label",