修改进厂，短信，等接口

pom.xml

@@ -94,6 +94,11 @@
             <artifactId>framework</artifactId>
             <version>1.0</version>
         </dependency>
+        <!-- https://mvnrepository.com/artifact/org.mybatis/mybatis -->
+        <dependency>
+            <groupId>org.mybatis</groupId>
+            <artifactId>mybatis</artifactId>
+        </dependency>
 
 
     </dependencies>
@@ -105,9 +110,9 @@
                 <artifactId>generator-maven-plugin</artifactId>
                 <version>3.0</version>
                 <configuration>
-                    <connUrl>jdbc:oracle:thin:@192.168.1.51:1521:steerinfo</connUrl>
-                    <user>dilusr</user>
-                    <password>stinf#0420</password>
+                    <connUrl>jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri</connUrl>
+                    <user>dil</user>
+                    <password>Dil123789</password>
                     <!--包名-->
                     <targetPackage>com.steerinfo.dil</targetPackage>
                     <tables>
@@ -143,7 +148,6 @@
                     <include>**/*.xml</include>
                 </includes>
             </resource>
-
             <resource>
                 <directory>src/main/resources</directory>
             </resource>

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

@@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -1094,7 +1095,7 @@ public class TMSController extends BaseRESTfulController {
     @ApiOperation(value="查询所有的进厂实绩")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(99)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId(220)", value = "动态表头", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
@@ -1110,6 +1111,15 @@ public class TMSController extends BaseRESTfulController {
         return tmsTruckFeign.getAllEnFactoryResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderType, con);
     }
 
+    @ApiOperation(value="通过运输订单id查询物资信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "orderId", value = "运输订单id", required = false, dataType = "Integer"),
+    })
+    @GetMapping("/getMaterial")
+    public Map<String, Object> getMaterial(Integer orderId){
+        return tmsTruckFeign.getMaterial(orderId);
+    }
+
     @ApiOperation(value="通过采集系统传来的数据新增进厂作业实绩")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "运输计划实绩对象", required = false, dataType = "Map"),
@@ -1534,4 +1544,25 @@ public class TMSController extends BaseRESTfulController {
     public Map<String,Object> updateTruckCalculate(@PathVariable("orderId") Integer orderId){
         return tmsTruckFeign.isNextNeedJl(orderId);
     }
+
+    @ApiOperation(value="查询所有的短信实绩")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(175)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getSmsResult")
+    public Map<String, Object> getSmsResult(@RequestBody(required=false) Map<String,Object> mapValue,
+                                            Integer apiId,
+                                            Integer pageNum,
+                                            Integer pageSize,
+                                            String con
+    ){
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return tmsTruckFeign.getSmsResult(mapValue,apiId,pageNum,pageSize,con);
+    }
 }

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

@@ -7,6 +7,7 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -74,7 +75,8 @@ public interface TmsTruckFeign {
                                                @RequestParam("orderType")Integer orderType,
                                                @RequestParam("con")      String con
     );
-
+    @GetMapping("api/v1/truckTms/tmstruckenfactoryresults/getMaterial")
+    public Map<String , Object> getMaterial(@RequestParam("orderId")  Integer orderId);
 
     @ApiOperation(value="通过采集系统传来的数据新增进厂作业实绩")
     @ApiImplicitParams({
@@ -255,6 +257,16 @@ public interface TmsTruckFeign {
      */
     @PostMapping("api/v1/truckTms/tmstruckweightresults/{orderId}")
     Map<String,Object> isNextNeedJl(@PathVariable("orderId") Integer orderId);
+
+    /**
+     *查询短信实绩
+     */
+    @PostMapping("api/v1/truckTms/tmstrucksmsrusults/getSmsResult")
+    Map<String,Object> getSmsResult(@RequestBody(required=false) Map<String,Object> mapValue,
+                                    @RequestParam("apiId") Integer apiId,
+                                    @RequestParam("pageNum") Integer pageNum,
+                                    @RequestParam("pageSize") Integer pageSize,
+                                    @RequestParam("con") String con);
 }
 
 

src/main/resources/bootstrap.yml

@@ -25,7 +25,7 @@ eureka:
 
 openfeign:
   ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:localhost:8083}
+    url: ${COLUMNDATAFEIGN_URL:172.16.33.161:8083}
   AmsFeign:
     url: ${AMSFEIGN_URL:localhost:8099}
   BmsshipFeign: