合并冲突

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

@@ -357,7 +357,8 @@ public class TMSController extends BaseRESTfulController {
     @PostMapping("addWaterQualityResult")
     @ApiOperation(value = "新增水分质检")
     Map<String, Object> addWaterQualityResult(@RequestBody Map<String, Object> map) {
-        return tmsshipFeign.addWaterQualityResult(map);
+        Map<String, Object> stringObjectMap = tmsshipFeign.addWaterQualityResult(map);
+        return stringObjectMap;
     }
 
     /**
@@ -421,15 +422,16 @@ public class TMSController extends BaseRESTfulController {
                                                            Integer pageNum,
                                                            Integer pageSize,
                                                            Integer apiId,
-                                                           String con) {
+                                                           String con,
+                                                           String status) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return tmsshipFeign.getShipMentInstructionsList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
+        return tmsshipFeign.getShipMentInstructionsList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con,status);
     }
 
     @PostMapping("getShipmentInstructions/{instructionsId}")
-    @ApiOperation(value = "查询装船指令")
+    @ApiOperation(value = "下发装船指令")
     Map<String, Object> getShipmentInstructions(@PathVariable("instructionsId") BigDecimal instructionsId) {
         return tmsshipFeign.getShipmentInstructions(instructionsId);
     }
@@ -440,10 +442,10 @@ public class TMSController extends BaseRESTfulController {
         return tmsshipFeign.deleteByPrimaryKey(instructionsId);
     }
 
-    @PostMapping("updateIssueStatus/{shipmentInstructionsId}")
+    @PostMapping("sendShipmentInstructionsStatus/{shipmentInstructionsId}")
     @ApiOperation(value = "修改状态")
-    Map<String, Object> updateIssueStatus(@PathVariable("shipmentInstructionsId") BigDecimal shipmentInstructionsId) {
-        return tmsshipFeign.updateIssueStatus(shipmentInstructionsId);
+    Map<String, Object> sendShipmentInstructionsStatus(@PathVariable("shipmentInstructionsId") BigDecimal shipmentInstructionsId) {
+        return tmsshipFeign.sendShipmentInstructionsStatus(shipmentInstructionsId);
     }
 
     @PostMapping("updateShipmentInstructions")
@@ -1871,6 +1873,14 @@ public class TMSController extends BaseRESTfulController {
         return tmsTrainFeign.batchSendMeasureCommission(map);
     }
 
+
+      //获取合同水分值，实装吨位，水分吨位
+    @PostMapping("/getMoistureAndInstallations")
+    public Map<String,Object> getMoistureAndInstallations(@RequestBody(required=false) Map<String,Object> map){
+        return tmsshipFeign.getMoistureAndInstallations(map);
+    }
+
+
     @ApiOperation(value="查询辅料燃料统计报表")
     @PostMapping("/getRLFLReport")
     public Map<String, Object> getRLFLReport(@RequestBody(required=false) Map<String,Object> mapValue,
@@ -1881,4 +1891,5 @@ public class TMSController extends BaseRESTfulController {
     ){
         return tmsTruckFeign.getRLFLReport(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, orderType);
     }
+
 }

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

@@ -441,7 +441,8 @@ public interface TmsshipFeign {
                                               @RequestParam Integer pageNum,
                                               @RequestParam Integer pageSize,
                                               @RequestParam Integer apiId,
-                                                    @RequestParam String con);
+                                                    @RequestParam String con,
+                                                    @RequestParam String status);
 
     /**
      * 查询装船指令
@@ -458,8 +459,8 @@ public interface TmsshipFeign {
      * @param shipmentInstructionsId
      * @return
      */
-    @PostMapping(value = "/api/v1/shipTms/omsshipshipmentinstructions/updateIssueStatus/{shipmentInstructionsId}")
-    Map<String, Object> updateIssueStatus(@PathVariable("shipmentInstructionsId") BigDecimal shipmentInstructionsId);
+    @PostMapping(value = "/api/v1/shipTms/omsshipshipmentinstructions/sendShipmentInstructionsStatus/{shipmentInstructionsId}")
+    Map<String, Object> sendShipmentInstructionsStatus(@PathVariable("shipmentInstructionsId") BigDecimal shipmentInstructionsId);
 
     /**
      * 删除装船指令
@@ -756,8 +757,15 @@ public interface TmsshipFeign {
     @PostMapping("api/v1/shipTms/shipdynamics/selectAll")
     Map<String, Object> selectAll();
 
+
+    //获取合同水分值，实装吨位，水分吨位
+    @PostMapping("api/v1/shipTms/tmsshipwaterqualityresults/getMoistureAndInstallations")
+    Map<String,Object> getMoistureAndInstallations(Map<String,Object> map);
+
     //    模糊查询江船名
     @PostMapping(value = "/api/v1/shipTms/dilbatchs/getShipNameList")
     Map<String, Object> getShipNameList(@RequestParam(value = "state")String state);
 
+
+
 }

src/main/resources/application-dev.yml

@@ -1,8 +1,8 @@
 spring:
   datasource:
     url: jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri
-    password: Dil123789
-    username: dil
+    password: root123
+    username: dagang
     driver-class-name: oracle.jdbc.OracleDriver
   application:
     name: dil-api

src/main/resources/application-prod.yml

@@ -1,8 +1,8 @@
 spring:
   datasource:
     url: jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri
-    password: Dil123789
-    username: dil
+    password: root123
+    username: dagang
     driver-class-name: oracle.jdbc.OracleDriver
   application:
     name: dil-api