修改

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/AMScontroller.java

@@ -1148,11 +1148,12 @@ public class AMScontroller{
                                           Integer pageSize,
                                           Integer apiId,
                                           Integer requirementStatus,
-                                          String orgCode) {
+                                          String orgCode,
+                                                       String index) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return amsFeign.getTruckRequirementList(mapValue, pageNum, pageSize, apiId,requirementStatus,orgCode);
+        return amsFeign.getTruckRequirementList(mapValue, pageNum, pageSize, apiId,requirementStatus,orgCode,index);
     }
 
     @PostMapping("/getPurRequirementList")
@@ -1886,9 +1887,10 @@ public class AMScontroller{
                                                   Integer pageNum,
                                                   Integer pageSize,
                                                   Integer apiId,
-                                                  String con
+                                                  String con,
+                                                  Integer deleted
     ) {
-        return amsFeign.getFuSaleOrderList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
+        return amsFeign.getFuSaleOrderList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con,new BigDecimal(deleted));
     }
 
     @ApiOperation(value = "修改销售订单中的物资")
@@ -1896,7 +1898,7 @@ public class AMScontroller{
             @ApiImplicitParam(name = "map", value = "修改销售订单中的物资", required = false, dataType = "java.util.Map")
     })
     @PostMapping(value = "/updateAllMaterialInSale")
-    public RESTfulResult updateAllMaterialInSale(@RequestBody Map<String, Object> mapValue) {
+    public Map<String,Object> updateAllMaterialInSale(@RequestBody Map<String, Object> mapValue) {
         return amsFeign.updateAllMaterialInSale(mapValue);
     }
 
@@ -1908,4 +1910,26 @@ public class AMScontroller{
     public Map<String,Object> deleteSaleOrderSame(@RequestBody Map<String, Object> mapValue) {
         return amsFeign.deleteSaleOrderSame(mapValue);
     }
+
+    @ApiOperation(value = "修改收货地址")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", value = "修改收货地址", required = false, dataType = "java.util.Map")
+    })
+    @PostMapping(value = "/updateCarAddress")
+    public Map<String,Object> updateCarAddress(@RequestBody Map<String, Object> mapValue) {
+        return amsFeign.updateCarAddress(mapValue);
+    }
+
+    @ApiOperation(value = "展示反审批的钢材订单")
+    @PostMapping("/getSteelOrderDeletedList")
+    public Map<String, Object> getSteelOrderDeletedList(@RequestBody(required = false) Map<String,Object> mapValue,
+                                                  Integer pageNum,
+                                                  Integer pageSize,
+                                                  Integer apiId,
+                                                  String con,
+                                                        String consigneeSsoId
+    ) {
+        return amsFeign.getSteelOrderDeletedList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con,consigneeSsoId);
+    }
+
 }

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

@@ -1128,4 +1128,40 @@ public class RMScontroller {
     public Map<String, Object> getCapacityInfoById(@PathVariable("id") Integer id){
         return rmsFeign.getCapacityInfoById(id);
     }
+
+   //获取货权转移送达单位列表
+    @PostMapping(value = "/getCargoDep")
+    public Map<String,Object> getCargoDep(@RequestBody(required = false) Map<String, Object> mapValue,
+                                     Integer apiId,
+                                     Integer pageNum,
+                                     Integer pageSize,
+                                     String con){
+        if (mapValue==null){
+            mapValue=new HashMap<>();
+        }
+        return rmsFeign.getCargoDep(mapValue,apiId,pageNum,pageSize,con);
+    }
+    //删除货权转移送达单位
+    @PostMapping(value = "/deleteCargoDep")
+    public Map<String, Object> deleteCargoDep(@RequestBody(required = false) Map<String,Object> map){
+        return rmsFeign.deleteCargoDep(map);
+    }
+    @PostMapping(value = "/getCargoDepById/{id}")
+    public Map<String,Object> getCargoDepById(@PathVariable("id") BigDecimal id){
+        return rmsFeign.getCargoDepById(id);
+    }
+
+    //更新货权转移送达单位
+    @PostMapping(value = "/updateCargoDep")
+    public Map<String, Object> updateCargoDep(@RequestBody(required = false) Map<String,Object> map){
+        return rmsFeign.updateCargoDep(map);
+    }
+
+    //新增货权转移送达单位
+    @PostMapping(value = "/insertCargoDep")
+    public Map<String, Object> insertCargoDep(@RequestBody(required = false) Map<String,Object> map){
+        return rmsFeign.insertCargoDep(map);
+    }
+
+
 }

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);
     }
 
     /**
@@ -970,6 +986,16 @@ public class TMSController extends BaseRESTfulController {
         return tmsTrainFeign.getUnloadingPointName();
     }
 
+
+    //下拉框
+    @ApiOperation(value = "获取货权转移图片")
+    @ApiImplicitParams({
+    })
+    @PostMapping(value = "/downLoadDeilveryNotice")
+    public Map<String, Object> downLoadDeilveryNotice(@RequestParam Integer noticeId) {
+        return tmsshipFeign.downLoadDeilveryNotice(noticeId);
+    }
+
     @ApiOperation(value = "获取卸车路径名称")
     @ApiImplicitParams({
     })
@@ -1926,9 +1952,10 @@ public class TMSController extends BaseRESTfulController {
                                                Integer pageSize,
                                                String startTime,
                                                String endTime,
-                                               Integer orderType
+                                               Integer orderType,
+                                               String con
     ){
-        return tmsTruckFeign.getRLFLReport(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime,  orderType);
+        return tmsTruckFeign.getRLFLReport(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime,  orderType,con);
     }
     @ApiOperation(value="查询销售统计报表")
     @PostMapping("/getAllSaleReport")
@@ -2218,8 +2245,9 @@ public class TMSController extends BaseRESTfulController {
                                                   Integer pageSize,
                                                   String startTime,
                                                   String endTime,
-                                                  String con){
-        return tmsTruckFeign.getCapacityByDefend(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize,startTime,endTime,con);
+                                                  String con,
+                                                  String yes){
+        return tmsTruckFeign.getCapacityByDefend(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize,startTime,endTime,con,yes);
     }
 
     @ApiOperation("厂外抵达作业")

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

@@ -1191,7 +1191,8 @@ public interface AmsFeign {
                                    @RequestParam Integer pageSize,
                                    @RequestParam Integer apiId,
                                    @RequestParam Integer requirementStatus,
-                                   @RequestParam String orgCode);
+                                   @RequestParam String orgCode,
+                                                @RequestParam String index);
 
     @ApiOperation(value="查询app端公开抢单")
     @PostMapping(value = "/api/v1/ams/amsdispatchsaleorders/getDispatchSaleOrderList")
@@ -1662,13 +1663,27 @@ public interface AmsFeign {
                                            @RequestParam Integer pageNum,
                                            @RequestParam Integer pageSize,
                                            @RequestParam Integer apiId,
-                                           @RequestParam String con);
+                                           @RequestParam String con,
+                                           @RequestParam BigDecimal deleted);
 
     // 展示副产品销售订单列表
     @PostMapping(value = "/api/v1/ams/amssaleorders/updateAllMaterialInSale")
-    RESTfulResult updateAllMaterialInSale(@RequestBody Map<String, Object> mapValue);
+    Map<String,Object> updateAllMaterialInSale(@RequestBody Map<String, Object> mapValue);
 
     // 同步关闭金蝶订单
     @PostMapping(value = "/api/v1/ams/amssaleorders/deleteSaleOrderSame")
     Map<String,Object> deleteSaleOrderSame(@RequestBody Map<String, Object> mapValue);
+
+    // 修改收货地址
+    @PostMapping(value = "/api/v1/ams/amssaleorders/updateCarAddress")
+    Map<String, Object> updateCarAddress(Map<String, Object> mapValue);
+
+    // 展示反审批的钢材订单
+    @PostMapping(value = "/api/v1/ams/amssaleorders/getSteelOrderDeletedList")
+    Map<String, Object> getSteelOrderDeletedList(@RequestBody(required = false) Map<String, Object> objectMap,
+                                                 @RequestParam Integer pageNum,
+                                                 @RequestParam Integer pageSize,
+                                                 @RequestParam Integer apiId,
+                                                 @RequestParam String con,
+                                                 @RequestParam String consigneeSsoId);
 }

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

@@ -618,4 +618,23 @@ public interface RmsFeign {
 
     @PostMapping("api/v1/rms/rmscapacity/getCapacityInfoById/{id}")
     Map<String,Object> getCapacityInfoById(@PathVariable("id") Integer id);
+
+    @PostMapping("api/v1/rms/rmscargodeps/getCargoDep")
+    Map<String, Object> getCargoDep(@RequestBody(required = false) Map<String, Object> mapValue,
+                                    @RequestParam("apiId") Integer apiId,
+                                    @RequestParam("pageNum") Integer pageNum,
+                                    @RequestParam("pageSize") Integer pageSize,
+                                    @RequestParam("con") String con);
+
+    @PostMapping("api/v1/rms/rmscargodeps/deleteCargoDep")
+    Map<String,Object> deleteCargoDep(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping("api/v1/rms/rmscargodeps/updateCargoDep")
+    Map<String, Object> updateCargoDep(@RequestBody(required = false) Map<String,Object> map);
+
+    @PostMapping("api/v1/rms/rmscargodeps/insertCargoDep")
+    Map<String, Object> insertCargoDep(@RequestBody(required = false) Map<String,Object> map);
+
+    @PostMapping("api/v1/rms/rmscargodeps/getCargoDepById/{id}")
+    Map<String, Object> getCargoDepById(@PathVariable("id") BigDecimal id);
 }

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

@@ -372,7 +372,8 @@ public interface TmsTruckFeign {
                                       @RequestParam("pageSize") Integer pageSize,
                                       @RequestParam("startTime") String startTime,
                                       @RequestParam("endTime")   String endTime,
-                                      @RequestParam("orderType") Integer orderType
+                                      @RequestParam("orderType") Integer orderType,
+                                      @RequestParam("con")String con
     );
 
     @PostMapping("api/v1/truckTms/tmstruckloadresults/cgNzLoadingResult")
@@ -543,7 +544,8 @@ public interface TmsTruckFeign {
                                           @RequestParam Integer pageSize,
                                             @RequestParam String startTime,
                                             @RequestParam String endTime,
-                                          @RequestParam String con
+                                          @RequestParam String con,
+                                            @RequestParam String yes
                                          );
 
     @PostMapping("api/v1/truckTms/tmstruckreceiptresults/getReceiptResult")

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: