Merge branch 'company'

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

@@ -306,6 +306,66 @@ public class OTMSController {
         return otmsFeign.findSelections();
     }
 
+    @ApiOperation(value="查询点")
+    @PostMapping(value = "/getMapVertex")
+    public RESTfulResult getMapVertex(@RequestBody Map<String,Object> map,
+                                      @RequestParam Integer apiId,
+                                      @RequestParam Integer pageNum,
+                                      @RequestParam Integer pageSize){
+        if(map==null){
+            map=new HashMap<>();
+        }
+        return otmsFeign.getMapVertex(map,apiId,pageNum,pageSize);
+    }
+
+    @ApiOperation(value="查询边")
+    @PostMapping(value = "/getMapEdge")
+    public RESTfulResult getMapEdge(@RequestBody Map<String,Object> map,
+                                    @RequestParam Integer apiId,
+                                    @RequestParam Integer pageNum,
+                                    @RequestParam Integer pageSize){
+        if(map==null){
+            map=new HashMap<>();
+        }
+        return otmsFeign.getMapEdge(map,apiId,pageNum,pageSize);
+    }
+
+    @ApiOperation(value="新增点")
+    @PostMapping(value = "/addMapVertex")
+    public RESTfulResult addMapVertex(@RequestBody Map<String,Object> map){
+        if(map==null){
+            map=new HashMap<>();
+        }
+        return otmsFeign.addMapVertex(map);
+    }
+
+    @ApiOperation(value="新增边")
+    @PostMapping(value = "/addMapEdge")
+    public RESTfulResult addMapEdge(@RequestBody Map<String,Object> map){
+        if(map==null){
+            map=new HashMap<>();
+        }
+        return otmsFeign.addMapEdge(map);
+    }
+
+    @ApiOperation(value="删除点")
+    @PostMapping(value = "/delMapVertex")
+    public RESTfulResult delMapVertex(@RequestBody Map<String,Object> map){
+        if(map==null){
+            map=new HashMap<>();
+        }
+        return otmsFeign.delMapVertex(map);
+    }
+
+    @ApiOperation(value="删除边")
+    @PostMapping(value = "/delMapEdge")
+    public RESTfulResult delMapEdge(@RequestBody Map<String,Object> map){
+        if(map==null){
+            map=new HashMap<>();
+        }
+        return otmsFeign.delMapEdge(map);
+    }
+
     //在途订单列表
     @PostMapping("/transportationPerformance")
     public RESTfulResult transportationPerformance(@RequestBody(required = false) Map<String,Object> mapValue,

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

@@ -131,6 +131,31 @@ public interface OtmsFeign {
     @GetMapping(value = "/api/v1/otms/mapvertexs/findSelections")
     public RESTfulResult findSelections();
 
+    @PostMapping("/api/v1/otms/mapvertexs/getMapVertex")
+    public RESTfulResult getMapVertex(@RequestBody Map<String,Object> map,
+                                      @RequestParam Integer apiId,
+                                      @RequestParam Integer pageNum,
+                                      @RequestParam Integer pageSize);
+
+    @PostMapping("/api/v1/otms/mapvertexs/getMapEdge")
+    public RESTfulResult getMapEdge(@RequestBody Map<String,Object> map,
+                                    @RequestParam Integer apiId,
+                                    @RequestParam Integer pageNum,
+                                    @RequestParam Integer pageSize);
+
+    @PostMapping("/api/v1/otms/mapvertexs/addMapVertex")
+    public RESTfulResult addMapVertex(@RequestBody Map<String,Object> map);
+
+    @PostMapping("/api/v1/otms/mapvertexs/addMapEdge")
+    public RESTfulResult addMapEdge(@RequestBody Map<String,Object> map);
+
+    @PostMapping("/api/v1/otms/mapvertexs/delMapVertex")
+    public RESTfulResult delMapVertex(@RequestBody Map<String,Object> map);
+
+    @PostMapping("/api/v1/otms/mapvertexs/delMapEdge")
+    public RESTfulResult delMapEdge(@RequestBody Map<String,Object> map);
+
+
     @PostMapping("/api/v1/otms/pathDisplay/offLineWarn")
     public String offLineWarn(@RequestParam(value = "data") String data) throws Exception;
 

src/main/resources/application-prod.yml

@@ -1,7 +1,7 @@
 spring:
   datasource:
-    url: jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri
-    password: Dil123789
+    url: jdbc:oracle:thin:@192.168.1.51:1521:steerinfo
+    password: dil
     username: dil
     driver-class-name: oracle.jdbc.OracleDriver
   application:
@@ -12,35 +12,35 @@ spring:
 
 openfeign:
   ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
+    url: ${COLUMNDATAFEIGN_URL:192.168.3.81:8083}
   AmsFeign:
-    url: ${AMSFEIGN_URL:172.16.33.166:8079}
+    url: ${AMSFEIGN_URL:192.168.3.81:8079}
   BmsshipFeign:
-    url: ${BMSSHIPFEIGN_URL:172.16.33.166:8078}
+    url: ${BMSSHIPFEIGN_URL:192.168.3.81:8078}
   BmstrainFeign:
-    url: ${BMSTRAINFEIGN_URL:172.16.33.166:8077}
+    url: ${BMSTRAINFEIGN_URL:192.168.3.81:8077}
   BmstruckFeign:
-    url: ${BMSTRUCKFEIGN_URL:172.16.33.166:8076}
+    url: ${BMSTRUCKFEIGN_URL:192.168.3.81:8076}
   QmsTruckFeign:
-    url: ${QMSTRUCKFEIGN_URL:172.16.33.166:8047}
+    url: ${QMSTRUCKFEIGN_URL:192.168.3.81:8047}
   TmsTrainFeign:
-    url: ${TMSTRAINFEIGN_URL:172.16.33.166:8086}
+    url: ${TMSTRAINFEIGN_URL:192.168.3.81:8086}
   TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8088}
+    url: ${TMSTRUCKFEIGN_URL:192.168.3.81:8088}
   TmsshipFeign:
-    url: ${TMSSHIPFEIGN_URL:172.16.33.166:8090}
+    url: ${TMSSHIPFEIGN_URL:192.168.3.81:8090}
   WMSHFeign:
-    url: ${WMSHFEIGN_URL:172.16.33.166:8070}
+    url: ${WMSHFEIGN_URL:192.168.3.81:8070}
   WMSFeign:
-    url: ${WMSFEIGN_URL:172.16.33.166:8093}
+    url: ${WMSFEIGN_URL:192.168.3.81:8093}
   OMSFeign:
-    url: ${OMSFEIGN_URL:172.16.33.166:8095}
+    url: ${OMSFEIGN_URL:192.168.3.81:8095}
   RmsFeign:
-    url: ${RMSFEIGN_URL:172.16.33.166:8060}
+    url: ${RMSFEIGN_URL:192.168.3.81:8060}
   JoinFeign:
-    url: ${JOINFEIGN_URL:172.16.33.166:8066}
+    url: ${JOINFEIGN_URL:192.168.3.81:8066}
   OTMSFeign:
-    url: ${OTMSFEIGN_URL:172.16.33.166:8038}
+    url: ${OTMSFEIGN_URL:192.168.3.81:8038}
 piction:
   # path: /usr/share/nginx/html/image
   #  path: /test/data/nginx/html/image