tijai

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

@@ -1091,7 +1091,7 @@ public class AMScontroller{
     }
     //删除用车需求
     @PostMapping("/deleteTruckRequirement/{requirementId}")
-    public Map<String,Object> deleteTruckRequirement(@PathVariable("requirementId") BigDecimal requirementId) {
+    public Map<String,Object> deleteTruckReqgetTruckRequirementListuirement(@PathVariable("requirementId") BigDecimal requirementId) {
         return amsFeign.deleteTruckRequirement(requirementId);
     }
     //下发用车需求

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

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -206,8 +207,8 @@ public class RMScontroller {
         return   rmsFeign.getCarrierBidAreaList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize,con);
     }
     //    处理承运商照片
-    @PostMapping("/uploadCarrier1")
-    public int uploadCarrier1(@RequestParam("file") MultipartFile multipartFile){
+    @PostMapping(value = "/uploadCarrier1")
+    public String uploadCarrier1(@RequestParam ("file") MultipartFile multipartFile){
         return rmsFeign.uploadCarrier1(multipartFile);
     }
     //    处理承运商照片

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

@@ -1818,9 +1818,11 @@ public class TMSController extends BaseRESTfulController {
                                               Integer pageNum,
                                               Integer pageSize,
                                               String con,
-                                              String  userId
+                                              String  userId,
+                                              String startTime,
+                                              String endTime
     ){
-        return tmsTruckFeign.getAllTimeTaskResult(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, con,userId);
+        return tmsTruckFeign.getAllTimeTaskResult(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, con,userId,startTime,endTime);
     }
 
     @ApiOperation(value="新增钢材到异地库达州站驻港人员确定收货")
@@ -1933,7 +1935,8 @@ public class TMSController extends BaseRESTfulController {
                                                Integer apiId,
                                                Integer pageNum,
                                                Integer pageSize,
-                                               String startTime, String endTime,
+                                               String startTime,
+                                               String endTime,
                                                Integer orderType
     ){
         return tmsTruckFeign.getRLFLReport(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime,  orderType);
@@ -1944,7 +1947,8 @@ public class TMSController extends BaseRESTfulController {
                                           Integer apiId,
                                           Integer pageNum,
                                           Integer pageSize,
-                                          String startTime, String endTime,
+                                          String startTime,
+                                          String endTime,
                                           String carrierSsoId
     ){
         return tmsTruckFeign.getAllSaleReport(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime, carrierSsoId);
@@ -2011,6 +2015,8 @@ public class TMSController extends BaseRESTfulController {
                                                           String endTime) {
         return tmsTruckFeign.getInwardReport(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, startTime, endTime);
     }
+
+
     @PostMapping("/sendMeasureCommission")
     public Map<String, Object> sendMeasureCommission(@RequestBody(required = false) Map<String, Object> map){
         return  tmsTruckFeign.sendMeasureCommission(map);
@@ -2062,6 +2068,23 @@ public class TMSController extends BaseRESTfulController {
         return tmsTruckFeign.getLoading(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime);
     }
 
+
+    @ApiOperation(value="对内转车辆装货点进行统计")
+    @PostMapping("/getLoaderResult")
+    public Map<String, Object> getLoaderResult(@RequestBody(required=false) Map<String,Object> mapValue,
+                                          Integer apiId,
+                                          Integer pageNum,
+                                          Integer pageSize,
+                                          String startTime,
+                                          String endTime
+    ){
+        return tmsTruckFeign.getLoaderResult(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime);
+    }
+
+
+
+
+
     @ApiOperation(value="对内转车辆装卸货点进行统计")
     @PostMapping("/getUnLoading")
     public Map<String, Object> getUnLoading(@RequestBody(required=false) Map<String,Object> mapValue,

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

@@ -178,6 +178,38 @@ public class UniversalController extends BaseRESTfulController {
     }
 
 
+
+
+    @ApiOperation(value="查询运力类型")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(248)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getCapacityType")
+    public RESTfulResult getCapacityType(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                     Integer apiId,
+                                                     Integer pageNum,
+                                                     Integer pageSize,
+                                                     String index
+    ){
+        if(mapValue == null){
+            mapValue = new HashMap<>();
+        }
+        if(index != null&&!index.equals("null")){
+            mapValue.put("index", index);
+        }
+        //不分页筛选数据
+        PageHelper.startPage(pageNum,pageSize);
+        //分页数据
+        List<Map<String, Object>> capacity = universalMapper.getCapacityType(mapValue);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, capacity);
+        return success(pageList);
+    }
+
+
+
     @ApiOperation(value="通过订单ID查询订单下所有物资")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),

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

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -108,14 +109,14 @@ public interface RmsFeign {
     @PostMapping(value = "api/v1/rms/rmscarrier/deleteCarrier/{id}")
     Map<String, Object> deleteCarrier(@PathVariable("id") BigDecimal id);
     //    处理承运商照片
-    @PostMapping("api/v1/rms/rmscarrier/uploadCarrier1")
-    int uploadCarrier1(@RequestParam("file") MultipartFile multipartFile);
+    @PostMapping(value = "api/v1/rms/rmscarrier/uploadCarrier1" ,consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    String uploadCarrier1(@RequestPart("file") MultipartFile multipartFile);
     //    处理承运商照片
     @PostMapping("api/v1/rms/rmscarrier/uploadCarrier2")
-    int uploadCarrier2(@RequestParam("file") MultipartFile multipartFile);
+    int uploadCarrier2(@RequestParam("file")MultipartFile multipartFile);
     //    处理承运商照片
     @PostMapping("api/v1/rms/rmscarrier/uploadCarrier3")
-    int uploadCarrier3(@RequestParam("file") MultipartFile multipartFile);
+    int uploadCarrier3(@RequestPart("file") MultipartFile multipartFile);
     //    更新承运商信息
     @PostMapping(value = "api/v1/rms/rmscarrier/updateCarrier")
     Map<String, Object> updateCarrier(@RequestBody(required = false) Map<String, Object> map);

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

@@ -330,7 +330,9 @@ public interface TmsTruckFeign {
                                               @RequestParam("pageNum") Integer pageNum,
                                               @RequestParam("pageSize") Integer pageSize,
                                               @RequestParam("con") String con,
-                                              @RequestParam("userId") String userId);
+                                              @RequestParam("userId") String userId,
+                                              @RequestParam("startTime") String startTime,
+                                              @RequestParam("endTime") String endTime);
 
     @PostMapping("api/v1/truckTms/tmstruckloadresults/addDaZhouToDaGangLoadResult")
     Map<String, Object> addDaZhouToDaGangLoadResult(@RequestBody(required = false)Map<String, Object> map);
@@ -477,6 +479,15 @@ public interface TmsTruckFeign {
                                      @RequestParam String endTime);
 
 
+    @PostMapping("api/v1/truckTms/statisticalReport/getLoaderResult")
+    Map<String, Object> getLoaderResult(@RequestBody(required = false) Map<String, Object> mapValue,
+                                     @RequestParam Integer apiId,
+                                     @RequestParam Integer pageNum,
+                                     @RequestParam Integer pageSize,
+                                     @RequestParam String startTime,
+                                     @RequestParam String endTime);
+
+
     @PostMapping("api/v1/truckTms/tmstrucktimetaskresults/JudgeTimeTask")
     Map<String, Object> JudgeTimeTask(@RequestBody Map<String, Object> map);
 

src/main/java/com/steerinfo/dil/mapper/UniversalMapper.java

@@ -139,8 +139,11 @@ public interface UniversalMapper {
 
     Map<String, Object> getRmsCarrierByCarrierSsoId(String carrierSsoId);
 
+    List<Map<String, Object>> getCapacityType(Map<String, Object> mapValue);
+
     Integer getPlanCount();
 
     List<Map<String, Object>> getTransRange();
 
+
 }

src/main/resources/application-dev.yml

@@ -30,10 +30,11 @@ openfeign:
   WMSFeign:
     url: ${WMSFEIGN_URL:172.16.33.162:8012}
   OMSFeign:
-    url: ${OMSFEIGN_URL:172.16.33.166:8016}
+    url: ${OMSFEIGN_URL:172.16.33.162:8016}
   RmsFeign:
-    url: ${RMSFEIGN_HRL:172.16.33.166:8014}
+    url: ${RMSFEIGN_HRL:172.16.33.162:8014}
   JoinFeign:
     url: ${JOINFEIGN_URL:172.16.33.162:8006}
+
 server:
   port: 8019

src/main/resources/bootstrap.yml

@@ -16,7 +16,7 @@ spring:
 eureka:
   client:
     service-url:
-      defaultZone: http://root:root@${EUREKA_HOST:172.16.33.161}:${EUREKA_PORT:8081}/eureka/
+      defaultZone: http://root:root@${EUREKA_HOST:172.16.33.166}:${EUREKA_PORT:8081}/eureka/
   instance:
     prefer-ip-address: true
     status-page-url: http://${spring.cloud.client.ip-address}:${server.port}/swagger-ui.html#/

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

@@ -147,7 +147,6 @@
 
     <!--  获取所有的运力信息 -->
     <select id="getAllCapacityByCarrierLike" parameterType="java.util.Map" resultType="java.util.LinkedHashMap">
-
         SELECT *
         FROM (
                  SELECT
@@ -161,7 +160,7 @@
                      ON RCC.CAPACITY_ID = RC.CAPACITY_ID
                           JOIN RMS_CARRIER RCA
                                 ON RCA.CARRIER_ID = RCC.CARRIER_ID
-                 WHERE RC.CAPACITY_TYPE_ID = 1 AND RC.CAPACITY_SSO_ID is not NULL
+                 WHERE  RC.CAPACITY_SSO_ID is not NULL
             <if test="carrierId != null" >
                 and RCC.CARRIER_ID = #{carrierId}
             </if>
@@ -747,6 +746,16 @@
         select r_carrier.CARRIER_NAME "carrierName", r_carrier.CARRIER_ID "carrierId"
         from RMS_CARRIER r_carrier
         where r_carrier.CARRIER_SSO_ID = #{carrierSsoId}
+    </select>
+
+    <select id="getCapacityType" resultType="java.util.Map" parameterType="java.util.Map">
+        select RCT.CAPACITY_TYPE_ID "capacityTypeId",
+               RCT.CAPACITY_TYPE_NAME "capacityTypeName"
+        from RMS_CAPACITY_TYPE RCT
+        <if test="index!=null">
+        where instr( RCT.CAPACITY_TYPE_NAME, #{index}) > 0
+        </if>
+
 
     </select>
     <select id="getPlanCount" resultType="java.lang.Integer">
@@ -758,6 +767,7 @@
         WHERE
             AIR.REQUIREMENT_STATUS = 2
           AND AIR.DELETED = 0
+>>>>>>> 2575cdbb9e23d44b2db153432ead44f438969766
     </select>
     <select id="getTransRange" resultType="java.util.Map">
         SELECT