'合并罗棒'

pom.xml

@@ -105,13 +105,12 @@
                 <artifactId>generator-maven-plugin</artifactId>
                 <version>3.0</version>
                 <configuration>
-                    <connUrl>jdbc:oracle:thin:@192.168.1.51:1521:steerinfo</connUrl>
-                    <user>dil0901</user>
-                    <password>st#0901</password>
+                    <connUrl>jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri</connUrl>
+                    <user>dil</user>
+                    <password>Dil123789</password>
                     <!--包名-->
                     <targetPackage>com.steerinfo.dil</targetPackage>
                     <tables>
-                        <param>RMS_MATERIAL_STEEL</param><!--运力-->
                     </tables>
                 </configuration>
                 <executions>

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

@@ -40,5 +40,4 @@ public class RmsConsigneeController extends BaseRESTfulController {
 
 
 
-
 }

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

@@ -57,5 +57,4 @@ public class RmsMaterialController extends BaseRESTfulController {
 
 
 
-
 }

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

@@ -56,6 +56,4 @@ public class RmsSupplierController extends BaseRESTfulController {
     }
 
 
-
-
 }

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

@@ -3,7 +3,7 @@ package com.steerinfo.dil.controller;
 import com.steerinfo.dil.service.impl.TmstruckWeightResultServiceImpl;
 import com.steerinfo.dil.util.BaseRESTfulController;
 import com.steerinfo.framework.controller.RESTfulResult;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -29,6 +29,37 @@ public class TmstruckWeightResultController extends BaseRESTfulController {
      * @return
      */
     @ApiModelProperty(value = "接收计量实绩")
+    @ApiOperation(value="接收计量实绩")
+    @ApiParam(name = "orderNumber")
+    @ApiImplicitParams({
+            @ApiImplicitParam(
+                    name = "orderNumber",value = "运输订单号",required = true,dataType = "String"
+            ),
+            @ApiImplicitParam(
+                    name = "tareCalculateNumber",value = "计皮汽车衡编号",required = true,dataType = "String"
+            ),
+            @ApiImplicitParam(
+                    name = "grossCalculatedNumber",value = "计毛汽车衡编号",required = true,dataType = "String"
+            ),
+            @ApiImplicitParam(
+                    name = "resultTareWeight",value = "皮重",required = true,dataType = "Double"
+            ),
+            @ApiImplicitParam(
+                    name = "resultTareWeightTime",value = "计皮时间",required = true,dataType = "Date"
+            ),
+            @ApiImplicitParam(
+                    name = "resultFrossWeight",value = "皮重",required = true,dataType = "Double"
+            ),
+            @ApiImplicitParam(
+                    name = "resultGrossWeightTime",value = "计毛时间",required = true,dataType = "Date"
+            ),
+            @ApiImplicitParam(
+                    name = "resultNetWeight",value = "净重",required = true,dataType = "Double"
+            )
+    }
+
+    )
+
     @PostMapping("/receiveTmsTruckWeightResult")
     public RESTfulResult receiveTmsTruckWeightResult(@RequestBody Map<String,Object> mapValue) {
         int result = tmstruckWeightResultService.receiveTmsTruckWeightResult(mapValue);

src/main/resources/application-dev.yml

@@ -5,5 +5,5 @@ spring:
     username: dil
     driver-class-name: oracle.jdbc.OracleDriver
   application:
-    name: [name]
+    name: dal-dazhou-join-api
 

src/main/resources/application-prod.yml

@@ -1,9 +1,8 @@
 spring:
   datasource:
     url: jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri
-    password: Dil123789
-    username: dil
+    password: dil
+    username: Dil123789
     driver-class-name: oracle.jdbc.OracleDriver
   application:
-    name: [name]
-
+    name: dal-dazhou-join-api

src/main/resources/bootstrap.yml

@@ -22,11 +22,6 @@ eureka:
     status-page-url: http://${spring.cloud.client.ip-address}:${server.port}/swagger-ui.html#/
     instance-id: ${spring.cloud.client.ip-address}:${server.port}
 
-
-openfeign:
-   ColumnDataFeign:
-   url: ${COLUMNDATAFEIGN_URL:localhost:8083}
-
 genxml:
   pth: com/a
 cache:

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

@@ -321,11 +321,11 @@
     <include refid="select" />
     where RESULT_ID = #{resultId,jdbcType=DECIMAL}
   </select>
-  <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="ResultMapWithBLOBs">
+  <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
     <include refid="select" />
     <include refid="where" />
   </select>
-  <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="ResultMapWithBLOBs">
+  <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
     <include refid="select" />
     <include refid="whereLike" />
   </select>