Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/DAL-DAZHOU-API

pom.xml

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

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

@@ -241,6 +241,18 @@ public class TMSController extends BaseRESTfulController {
   }
 
 
+    //框计算计算货权转移中出现的批次
+    @PostMapping("/getBatchIdByForeign")
+    public Map<String, Object> getBatchIdByForeign(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                       Integer pageNum,
+                                                       Integer pageSize,
+                                                       Integer apiId,
+                                                       String con){
+        return  tmsshipFeign.getBatchIdByForeign(mapValue==null?new HashMap<String, Object>():mapValue, pageNum, pageSize, apiId, con);
+    }
+
+
+
     /**
      * 展示船只信息
      *
@@ -651,8 +663,12 @@ public class TMSController extends BaseRESTfulController {
     }
     //船舶动态表
     @PostMapping("/selectAllShipDynamaics")
-    Map<String, Object> selectAllShipDynamaics(){
-        return tmsshipFeign.selectAllShipDynamaics();
+    Map<String, Object> selectAllShipDynamaics(@RequestBody(required = false) Map<String,Object> map,
+                                               String con){
+        if (map==null){
+            map=new HashMap<>();
+        }
+        return tmsshipFeign.selectAllShipDynamaics(map,con);
     }
 
     /**
@@ -2284,4 +2300,15 @@ public class TMSController extends BaseRESTfulController {
         }
         return map;
     }
+
+    //根据用户输入提货联系人模糊查询提货联系人、提货人身份证号、联系电话
+    @ApiOperation(value="根据用户输入提货联系人模糊查询提货联系人、提货人身份证号、联系电话", notes="模糊查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "personName",value = "用户输入的输入提货联系人", required = false, dataType = "String")
+    })
+
+    @PostMapping("/getPersonByName")
+    public Map<String,Object>  getPersonByName(@RequestParam(value ="personName")String personName){
+        return tmsshipFeign.getPersonByName(personName);
+    }
 }

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

@@ -253,5 +253,4 @@ public interface TmsTrainFeign {
     @PostMapping(value = "api/v1/trainTms/tmstrainmeasurecommissions/batchSendMeasureCommission")
     Map<String, Object> batchSendMeasureCommission(@RequestBody(required = false) Map<String, Object> map);
 
-
 }

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

@@ -1,5 +1,6 @@
 package com.steerinfo.dil.feign;
 
+import com.steerinfo.framework.controller.RESTfulResult;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
@@ -548,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);
+
     /**
      * 展示货权转移
      *
@@ -757,8 +771,11 @@ public interface TmsshipFeign {
     @PostMapping(value = "/api/v1/shipTms/dilbatchs/getShipNameList")
     Map<String, Object> getShipNameList(@RequestParam(value = "state")String state);
 
-    @ApiOperation(value = "查看货权转移图片")
+    //  根据用户输入提货联系人模糊查询提货联系人、提货人身份证号、联系电话
+    @PostMapping("/api/v1/shipTms/dilbatchs/getPersonByName")
+    Map<String, Object> getPersonByName(@RequestParam(value ="personName")String personName);
+
+
     @PostMapping(value =  "api/v1/shipTms/amsshipdeliverynotices/downLoadDeilveryNotice")
     Map<String, Object> downLoadDeilveryNotice(@RequestParam("noticeId") Integer noticeId);
-
 }

src/main/resources/application-dev.yml

@@ -4,8 +4,26 @@ spring:
     password: root123
     username: DAGANG
     driver-class-name: oracle.jdbc.OracleDriver
+
   application:
     name: dil-api
+
+#  druid:
+#    stat-view-servlet:
+#      #是否启用StatViewServlet(监控页面),默认true-启动，false-不启动
+#      enabled: false
+#      url-pattern: '/druid/*'
+#      # IP白名单(没有配置或者为空，则允许所有访问)
+#      allow:
+#      # IP黑名单(存在共同时,deny优先于allow)
+#      deny:
+#      # 禁用HTML页面上的"Reset All"功能
+#      reset-enable: false
+#      # 登录名
+#      login-username: admin
+#      # 登录密码
+#      login-password: dagang0426
+
 openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
@@ -23,7 +41,6 @@ openfeign:
     url: ${TMSTRAINFEIGN_URL:172.16.33.162:8004}
   TmsTruckFeign:
     url: ${TMSTRUCKFEIGN_URL:172.16.33.162:8008}
-    #url: ${TMSTRUCKFEIGN_URL:localhost:8088}
   TmsshipFeign:
     url: ${TMSSHIPFEIGN_URL:172.16.33.162:8003}
   WMSHFeign:

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>