tijiao

pom.xml

@@ -71,10 +71,10 @@
             <version>3.4.2</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-security</artifactId>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.springframework.boot</groupId>-->
+<!--            <artifactId>spring-boot-starter-security</artifactId>-->
+<!--        </dependency>-->
 
         <!--swagger-->
         <dependency>

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

@@ -549,10 +549,23 @@ public interface TmsshipFeign {
                                      @RequestParam Integer apiId,
                                      @RequestParam String con);
 
+
+    @PostMapping(value = "/api/v1/shipTms/dilbatchs/getBatchIdByForeign")
+    Map<String, Object> getBatchIdByForeign(@RequestBody(required = false) Map<String, Object> mapValue,
+                                            @RequestParam Integer pageNum,
+                                            @RequestParam Integer pageSize,
+                                            @RequestParam Integer apiId,
+                                            @RequestParam String con);
+
     //获取船运物资id
     @GetMapping("/api/v1/shipTms/amsshipcargotransferresults/getMaterialId")
     Map<String,Object> getMaterialId();
 
+    //船舶动态表
+    @PostMapping("api/v1/shipTms/shipdynamics/selectAllShipDynamaics")
+    Map<String, Object> selectAllShipDynamaics(@RequestBody(required = false) Map<String,Object> map,
+                                               @RequestParam("con") String con);
+
     /**
      * 展示货权转移
      *
@@ -762,9 +775,11 @@ public interface TmsshipFeign {
     @PostMapping("/api/v1/shipTms/dilbatchs/getPersonByName")
     Map<String, Object> getPersonByName(@RequestParam(value ="personName")String personName);
 
-
     @ApiOperation("value=查询船舶状态")
     @PostMapping(value = "/api/v1/shipTms/tmsshipshiplocations/getShipLocationStatus")
     Map<String, Object> getShipLocationStatus(@RequestParam("shipLocation") String shipLocation);
 
+
+    @PostMapping(value =  "api/v1/shipTms/amsshipdeliverynotices/downLoadDeilveryNotice")
+    Map<String, Object> downLoadDeilveryNotice(@RequestParam("noticeId") Integer noticeId);
 }

src/main/resources/application-prod.yml

@@ -23,9 +23,9 @@ openfeign:
   TmsTrainFeign:
     url: ${TMSTRAINFEIGN_URL:172.16.33.166:8086}
   TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8088}
+    url: ${TMSTRUCKFEIGN_URL:localhost:8088}
   TmsshipFeign:
-    url: ${TMSSHIPFEIGN_URL:localhost:8090}
+    url: ${TMSSHIPFEIGN_URL:172.16.33.166:8090}
   WMSHFeign:
     url: ${WMSHFEIGN_URL:172.16.33.166:8070}
   WMSFeign:

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

@@ -688,16 +688,20 @@
     <select id="getBatchByLike" parameterType="string" resultType="java.util.Map">
         select *
         from (
-                 select DB.BATCH_ID                                                         "batchId",
-                        DB.RESULT_FOREIGN_SHIP_NAME                                         "foreignShipName",
-
-                        CONCAT(DB.RESULT_FOREIGN_SHIP_NAME, '"' || RM.MATERIAL_NAME || '"') "value"
+                 select 		DBI.BATCH_INFACOTRY_ID        "batchId",
+                               DB.RESULT_FOREIGN_SHIP_NAME      "foreignShipName",
+                               DBI.INFACTORY_SHIP_NAME				"infactoryShipName",
+                               CONCAT(DB.RESULT_FOREIGN_SHIP_NAME, '"' || RM.MATERIAL_NAME || '"' || DBI.INFACTORY_SHIP_NAME) "value"
                  from DIL_BATCH DB
-                          left join RMS_MATERIAL RM on RM.MATERIAL_ID = DB.MATERIAL_ID
-                          join AMS_PURCHASE_ORDER APO on APO.BATCH_ID = DB.BATCH_ID
-                 where DB.RESULT_FOREIGN_SHIP_NAME is not null
+                          left join DIL_BATCH_INFACOTRY DBI
+                                    on DB.BATCH_ID=DBI.BATCH_ID
+                          left join RMS_MATERIAL RM
+                                    on RM.MATERIAL_ID = DB.MATERIAL_ID
+                          join AMS_PURCHASE_ORDER APO
+                               on APO.BATCH_ID = DB.BATCH_ID
+                 where DB.RESULT_FOREIGN_SHIP_NAME is not null and DBI.INFACTORY_SHIP_NAME is not null
              )
-        where instr("foreignShipName", #{index}) > 0
+        where instr("value", #{index}) > 0
 
     </select>