修改

.gitignore

@@ -9,7 +9,7 @@ src/test
 src/main/resources/application-dev2.yml
 # Compiled class file
 *.class
-
+*.xlsx
 # Log file
 *.log
 

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

@@ -1,28 +0,0 @@
-package com.steerinfo.dil.controller;
-
-
-import com.steerinfo.dil.feign.BmsFeign;
-import com.steerinfo.dil.util.BaseRESTfulController;
-import com.steerinfo.framework.controller.RESTfulResult;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartRequest;
-
-import java.math.BigDecimal;
-import java.util.*;
-
-/**
- * @author hujianguo
- * @create 2021-09-22 17:10
- */
-@RestController
-@RequestMapping("${api.version}/bms")
-public class BMSController extends BaseRESTfulController {
-
-
-}

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

@@ -1,22 +0,0 @@
-package com.steerinfo.dil.controller;
-
-import com.steerinfo.dil.feign.OmsFeign;
-import io.swagger.annotations.*;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.math.BigDecimal;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author luobang
- * @create 2021-09-17 14:10
- */
-@RestController
-@RequestMapping("${api.version}/oms")
-public class OMSController {
- 
-
-}

src/main/java/com/steerinfo/dil/feign/BmsFeign.java

@@ -1,22 +0,0 @@
-package com.steerinfo.dil.feign;
-
-import com.steerinfo.framework.controller.RESTfulResult;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @Description:
- * @Author:HuJianGuo
- * @GreateTime:2021/9/23 8:46
- * @Version:V2.0
- */
-@FeignClient(value = "ANTAI-BMS-API", url = "${openfeign.BmsFeign.url}")
-public interface BmsFeign {
-
-}

src/main/java/com/steerinfo/dil/feign/OmsFeign.java

@@ -1,20 +0,0 @@
-package com.steerinfo.dil.feign;
-
-import io.swagger.annotations.ApiOperation;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.*;
-
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @ author    :TXF
- * @ time      :2021/10/28 13:28
- */
-
-@FeignClient(value = "ANTAI-OMS-API", url = "${openfeign.OMSFeign.url}")
-public interface OmsFeign {
-
-}
-

src/main/resources/application-dev.yml

@@ -24,31 +24,23 @@ eureka:
 
 openfeign:
   ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:172.16.90.214:8083}
+    url: ${COLUMNDATAFEIGN_URL:172.16.90.214:80}
   AmsFeign:
-    url: ${AMSFEIGN_URL:localhost:8079}
-  BmsFeign:
-    url: ${BMSFEIGN_URL:172.16.90.214:8078}
+    url: ${AMSFEIGN_URL:172.16.90.214:80}
   TmsFeign:
-    url: ${TMSFEIGN_URL:172.16.90.214:8086}
+    url: ${TMSFEIGN_URL:172.16.90.214:80}
   WMSFeign:
-    url: ${WMSFEIGN_URL:172.16.90.214:8093}
-  OMSFeign:
-    url: ${OMSFEIGN_URL:172.16.90.214:8095}
+    url: ${WMSFEIGN_URL:172.16.90.214:80}
   RmsFeign:
-    url: ${RMSFEIGN_URL:localhost:8060}
-  IntegrationFeign:
-    url: ${INTEGRATIONFEIGN_URL:172.16.90.214:8066}
-  OTMSFeign:
-    url: ${OTMSFEIGN_URL:172.16.90.214:8038}
+    url: ${RMSFEIGN_URL:172.16.90.214:80}
   EmsFeign:
-    url: ${TMSFEIGN_URL:172.16.90.214:8096}
+    url: ${TMSFEIGN_URL:172.16.90.214:80}
   SSOFeign:
-    url: ${SSOFEIGN_URL:172.16.90.214:9001}
+    url: ${SSOFEIGN_URL:172.16.90.214:80}
   WebSocketFeign:
-    url: ${WEBSOCKETFEIGN_URL:172.16.90.214:8000}
+    url: ${WEBSOCKETFEIGN_URL:172.16.90.214:80}
   REPORTFeign:
-    url: ${REPORTFEIGN_URL:172.16.90.214:8055}
+    url: ${REPORTFEIGN_URL:172.16.90.214:80}
 
 
 #远程调用

src/main/resources/application-prod.yml

@@ -27,20 +27,12 @@ openfeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.90.202:80}
   AmsFeign:
     url: ${AMSFEIGN_URL:172.16.90.202:80}
-  BmsFeign:
-    url: ${BMSFEIGN_URL:172.16.90.202:80}
   TmsFeign:
     url: ${TMSFEIGN_URL:172.16.90.202:80}
   WMSFeign:
     url: ${WMSFEIGN_URL:172.16.90.202:80}
-  OMSFeign:
-    url: ${OMSFEIGN_URL:172.16.90.202:80}
   RmsFeign:
     url: ${RMSFEIGN_URL:172.16.90.202:80}
-  IntegrationFeign:
-    url: ${INTEGRATIONFEIGN_URL:172.16.90.202:80}
-  OTMSFeign:
-    url: ${OTMSFEIGN_URL:172.16.90.202:80}
   EmsFeign:
     url: ${TMSFEIGN_URL:172.16.90.202:80}
   SSOFeign:

src/main/resources/bootstrap.yml

@@ -1,7 +1,7 @@
 api.version: api/v1
 spring:
   profiles:
-    include: ${SPRING_PROFILES:dev}
+    include: ${SPRING_PROFILES:prod}
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8

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

@@ -233,7 +233,11 @@
             <if test="remark!=null and remark!=''">
                 AND REGEXP_LIKE("remark", #{remark})
             </if>
+            <if test="lastIndex!=null">
+                and "operationsNameId" &lt; #{lastIndex}
+            </if>
         </where>
+        order by "operationsNameId" desc
         FETCH NEXT 10 ROWS ONLY
         )
         <if test="id!=null and id.size>0">
@@ -373,10 +377,16 @@
             <if test="index!=null and index!=''">
                 AND REGEXP_LIKE("label", #{index})
             </if>
+            <if test="lastIndex!=null">
+                and "personnelId" &lt; #{lastIndex}
+            </if>
         </where>
         <if test="capacityId!=null and capacityId!=''">
             ORDER BY "countNumber" DESC
         </if>
+        <if test="!(capacityId!=null and capacityId!='')">
+            order by "personnelId" desc
+        </if>
         FETCH NEXT 10 ROWS ONLY
     )
     <if test="id!=null and id.size>0">
@@ -444,6 +454,7 @@
         when oto.capacity_id is null then '空闲'
         when oto.deleted != '2' and oto.capacity_id is not null then '已派'
         end) "status",
+        RCT.CAPACITY_TYPE_NAME "capacityTypeName",
         'capacityNumber' "prop"
         <if test="(driverId!=null and driverId!='') or (driverId2!=null and driverId2!='')">
             ,NVL(T ."countNumber",0) "countNumber"
@@ -493,9 +504,17 @@
             <if test="capacityId!=null and capacityId!=''">
                 AND RCA .CAPACITY_ID = #{capacityId}
             </if>
+
+            <if test="lastIndex!=null">
+                and RCA.CAPACITY_ID &lt; #{lastIndex}
+            </if>
             <if test="(driverId!=null and driverId!='') or (driverId2!=null and driverId2!='')">
                 ORDER BY "countNumber" DESC
             </if>
+            <if test="!((driverId!=null and driverId!='') or (driverId2!=null and driverId2!=''))">
+                order by RCA.CAPACITY_ID desc
+            </if>
+
             FETCH NEXT 10 ROWS ONLY
         )
         <if test="id!=null and id.size>0">
@@ -521,6 +540,7 @@
             when oto.capacity_id is null then '空闲'
             when oto.deleted != '2' and oto.capacity_id is not null then '已派'
             end) "status",
+            RCT.CAPACITY_TYPE_NAME "capacityTypeName",
             'capacityNumber' "prop"
             <if test="(driverId!=null and driverId!='') or (driverId2!=null and driverId2!='')">
                 ,NVL(T ."countNumber",0) "countNumber"
@@ -737,7 +757,11 @@
                     #{item}
                 </foreach>
             </if>
+            <if test="lastIndex!=null">
+                and "transrangeId" &lt; #{lastIndex}
+            </if>
         </where>
+        order by "transrangeId" desc
         FETCH NEXT 10 ROWS ONLY
     </select>
     <select id="getCategoryCodeByLike" resultType="java.util.Map">
@@ -797,8 +821,12 @@
                     #{item}
                 </foreach>
             </if>
+            <if test="lastIndex!=null">
+                and RCT.CAPACITY_TYPE_ID &lt; #{lastIndex}
+            </if>
         </where>
-        GROUP BY RCT .CAPACITY_TYPE_ID,RCT.CAPACITY_TYPE_NAME,RCT .CAPACITY_MAX_LOAD
+        GROUP BY RCT.CAPACITY_TYPE_ID,RCT.CAPACITY_TYPE_NAME,RCT .CAPACITY_MAX_LOAD
+        ORDER BY RCT.CAPACITY_TYPE_ID desc
         FETCH NEXT 10 ROWS ONLY
         )
         <if test="id!=null and id.size>0">
@@ -910,16 +938,16 @@
         select * from(
         select
         RC.MATERIAL_ID "materialId",
-        RC.MATERIAL_NAME "materialName",
+        RC.MATERIAL_NAME "label",
         RC.MATERIAL_ID "id",
         RC.MATERIAL_ID "value",
-        RC.MATERIAL_NAME  || '-' || RC.MATERIAL_CODE ||
+        RC.MATERIAL_CODE ||
         (CASE WHEN RC.MATERIAL_SPECIFICATION IS NOT NULL
         THEN '-' || RC.MATERIAL_SPECIFICATION
         WHEN RC.MATERIAL_MODEL IS NOT NULL
         THEN '-' || RC.MATERIAL_MODEL
         ELSE ''
-        END) "label",
+        END)|| '-' || RC.MATERIAL_NAME "materialName",
 
         RC.MATERIAL_NAME "text",
         'materialName' "prop"
@@ -927,13 +955,14 @@
         <where>
             DELETED = 0
             <if test="index!=null and index!=''">
-                AND REGEXP_LIKE(RC.MATERIAL_CODE || '-' || RC.MATERIAL_NAME ||
-                (CASE WHEN RC.MATERIAL_SPECIFICATION IS NOT NULL
-                THEN '-' || RC.MATERIAL_SPECIFICATION
-                WHEN RC.MATERIAL_MODEL IS NOT NULL
-                THEN '-' || RC.MATERIAL_MODEL
-                ELSE ''
-                END), #{index})
+                AND instr(RC.MATERIAL_CODE || (CASE
+                WHEN RC.MATERIAL_SPECIFICATION IS NOT NULL THEN
+                '-' || RC.MATERIAL_SPECIFICATION
+                WHEN RC.MATERIAL_MODEL IS NOT NULL THEN
+                '-' || RC.MATERIAL_MODEL
+                ELSE
+                ''
+                END) || '-' || RC.MATERIAL_NAME, #{index})>0
             </if>
             <if test="materialId!=null and materialId!=''">
                 AND RC.MATERIAL_ID = #{materialId}
@@ -945,16 +974,16 @@
         UNION
             select
             RC.MATERIAL_ID "materialId",
-            RC.MATERIAL_NAME "materialName",
+            RC.MATERIAL_NAME "label",
             RC.MATERIAL_ID "id",
             RC.MATERIAL_ID "value",
-            RC.MATERIAL_CODE || '-' || RC.MATERIAL_NAME ||
+            RC.MATERIAL_NAME ||
             (CASE WHEN RC.MATERIAL_SPECIFICATION IS NOT NULL
             THEN '-' || RC.MATERIAL_SPECIFICATION
             WHEN RC.MATERIAL_MODEL IS NOT NULL
             THEN '-' || RC.MATERIAL_MODEL
             ELSE ''
-            END) "label",
+            END) || '-' || RC.MATERIAL_CODE "materialName",
             RC.MATERIAL_NAME "text",
             'materialName' "prop"
             from RMS_MATERIAL RC