修改提交

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

@@ -21,9 +21,9 @@ public class DilVersionController {
     DilVersionServiceImpl dilVersionService;
 
     @ApiOperation(value = "查询版本号")
-    @PostMapping("/checkVersion/{version}")
-    public int deleteTruckRailDayPlan(@PathVariable("version") String version) {
-        return dilVersionService.compareAppVersion(version);
+    @PostMapping("/checkVersion")
+    public String deleteTruckRailDayPlan() {
+        return dilVersionService.compareAppVersion();
     }
 
     @ApiOperation(value = "新增版本号")

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

@@ -985,4 +985,25 @@ public class RMScontroller {
     public Map<String,Object> upLoadPhoto(@RequestParam("file") MultipartFile file){
         return rmsFeign.upLoadPhoto(file);
     }
+
+    /*
+        txf
+     */
+    @ApiOperation(value="新增组织结构实绩")
+    @PostMapping(value = "/addShipperResult")
+    public Map<String,Object>  addShipperResult(@RequestBody(required = false) Map<String, Object> map){
+        return rmsFeign.addShipperResult(map);
+    }
+
+    @ApiOperation(value="修改组织结构实绩")
+    @PostMapping(value = "/updateShipperResult")
+    public Map<String,Object>  updateShipperResult(@RequestBody(required = false) Map<String, Object> map){
+        return rmsFeign.updateShipperResult(map);
+    }
+
+    @ApiOperation(value="修改组织结构实绩")
+    @PostMapping(value = "/deleteShipperResult")
+    public Map<String,Object>  deleteShipperResult(@RequestBody(required = false) Map<String, Object> map){
+        return rmsFeign.deleteShipperResult(map);
+    }
 }

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

@@ -534,4 +534,17 @@ public interface RmsFeign {
     //上传图片
     @PostMapping(value = "api/v1/rms/rmscardriver/upload")
     Map<String,Object> upLoadPhoto(@RequestParam("file") MultipartFile file);
+
+
+    @ApiOperation(value="新增组织结构实绩")
+    @PostMapping(value = "api/v1/rms/rmsshipper/addShipperResult")
+    Map<String,Object>  addShipperResult(@RequestBody(required = false) Map<String, Object> map);
+
+    @ApiOperation(value="修改组织结构实绩")
+    @PostMapping(value = "api/v1/rms/rmsshipper/updateShipperResult")
+    Map<String,Object>  updateShipperResult(@RequestBody(required = false) Map<String, Object> map);
+
+    @ApiOperation(value="修改组织结构实绩")
+    @PostMapping(value = "api/v1/rms/rmsshipper/deleteShipperResult")
+    Map<String,Object>  deleteShipperResult(@RequestBody(required = false) Map<String, Object> map);
 }

src/main/java/com/steerinfo/dil/service/IDilVersionService.java

@@ -20,7 +20,7 @@ import java.math.BigDecimal;
  */
 public interface IDilVersionService{
 
-    int compareAppVersion(String version);
+    String compareAppVersion();
 
     String addAppVersion(String version);
 

src/main/java/com/steerinfo/dil/service/impl/DilVersionServiceImpl.java

@@ -33,17 +33,11 @@ public class DilVersionServiceImpl implements IDilVersionService {
 
     /**
      * 传入版本号查询是否为最新版本
-     * @param version 版本号
      * @return 0 不需要更新  1 需要更新
      */
-    public int compareAppVersion(String version){
+    public String compareAppVersion(){
         //查找当前最新版本号
-        String theLastVersion = dilVersionMapper.compareVersion();
-        //判断是否为最新版本号
-        if(theLastVersion.equals(version)){
-            return 0;
-        }
-        return 1;
+        return  dilVersionMapper.compareVersion();
     }
 
     /**

src/main/resources/bootstrap.yml

@@ -41,7 +41,7 @@ openfeign:
     TmsTrainFeign:
       url: ${TMSTRAINFEIGN_URL:172.16.33.166:8086}
     TmsTruckFeign:
-      url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8088}
+      url: ${TMSTRUCKFEIGN_URL:localhost:8088}
     TmsshipFeign:
       url: ${TMSSHIPFEIGN_URL:172.16.33.166:8090}
     WMSHFeign:
@@ -49,9 +49,9 @@ openfeign:
     WMSFeign:
       url: ${WMSFEIGN_URL:172.16.33.166:8093}
     OMSFeign:
-      url: ${OMSFEIGN_URL:172.16.33.166:8095}
+      url: ${OMSFEIGN_URL:localhost:8095}
     RmsFeign:
-      url: ${RMSFEIGN_HRL:172.16.33.166:8060}
+      url: ${RMSFEIGN_HRL:localhost:8060}
 
 
 #    ColumnDataFeign: