Your Name 3 лет назад
Родитель
Сommit
6578df87bd

+ 3 - 3
pom.xml

@@ -105,9 +105,9 @@
                 <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>

+ 32 - 1
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);

+ 4 - 4
src/main/resources/application-dev.yml

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

+ 4 - 4
src/main/resources/application-prod.yml

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

+ 1 - 1
src/main/resources/bootstrap.yml

@@ -16,7 +16,7 @@ spring:
 eureka:
   client:
     service-url:
-      defaultZone: http://root:root@${EUREKA_HOST:paas-discovery-test.steerinfo.com}:${EUREKA_PORT:80}/eureka/
+      defaultZone: http://root:root@${EUREKA_HOST:localhost}:${EUREKA_PORT:8061}/eureka/
   instance:
     prefer-ip-address: true
     status-page-url: http://${spring.cloud.client.ip-address}:${server.port}/swagger-ui.html#/