承运商修改

.idea/workspace.xml

@@ -28,6 +28,7 @@
       <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/jarRepositories.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/jarRepositories.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+
       <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/controller/RmsCarrierController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/controller/RmsCarrierController.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/IRmsCarrierService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/IRmsCarrierService.java" afterDir="false" />
@@ -36,6 +37,9 @@
       <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/controller/RmsCarrierController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/controller/RmsCarrierController.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/IRmsCarrierService.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/IRmsCarrierService.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/impl/RmsCarrierServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/impl/RmsCarrierServiceImpl.class" afterDir="false" />
+
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/controller/RmsOilPriceController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/controller/RmsOilPriceController.java" afterDir="false" />
+
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -68,7 +72,11 @@
     <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
+
     <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/impl" />
+
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../DAL-DAZHOU-API" />
+
     <property name="node.js.detected.package.eslint" value="true" />
     <property name="node.js.detected.package.tslint" value="true" />
     <property name="node.js.path.for.package.eslint" value="project" />
@@ -111,6 +119,8 @@
       <updated>1639799862423</updated>
       <workItem from="1639799866763" duration="17817000" />
       <workItem from="1639963691127" duration="15865000" />
+      <workItem from="1639799866763" duration="19781000" />
+      <workItem from="1639960339544" duration="3726000" />
     </task>
     <servers />
   </component>
@@ -137,6 +147,7 @@
       <screen x="0" y="0" width="1536" height="824" />
     </state>
     <state width="444" height="466" key="DebuggerActiveHint/0.0.1536.824@0.0.1536.824" timestamp="1639818003519" />
+
     <state x="458" y="137" key="FileChooserDialogImpl" timestamp="1639965013078">
       <screen x="0" y="0" width="1280" height="680" />
     </state>
@@ -145,6 +156,13 @@
     <state width="1237" height="305" key="GridCell.Tab.0.bottom" timestamp="1639989735386">
       <screen x="0" y="0" width="1280" height="680" />
     </state>
+    <state x="549" y="166" key="FileChooserDialogImpl" timestamp="1639961493966">
+      <screen x="0" y="0" width="1536" height="824" />
+    </state>
+    <state x="549" y="166" key="FileChooserDialogImpl/0.0.1536.824@0.0.1536.824" timestamp="1639961493966" />
+    <state width="1493" height="462" key="GridCell.Tab.0.bottom" timestamp="1639822112420">
+      <screen x="0" y="0" width="1536" height="824" />
+    </state>
     <state width="1237" height="305" key="GridCell.Tab.0.bottom/0.0.1280.680@0.0.1280.680" timestamp="1639989735386" />
     <state width="1493" height="462" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1639822112420" />
     <state width="1237" height="305" key="GridCell.Tab.0.center" timestamp="1639989735386">

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

@@ -61,38 +61,6 @@ public class RmsOilPriceController extends BaseRESTfulController {
     @Autowired
     ESFeign esFeign;
 
-
-
-    /**
-     * 展示油价信息
-     * @param mapVal
-     * @param pageNum
-     * @param pageSize
-     * @param apiId
-     * @return
-     */
-    //测试成功
-    @ApiOperation(value="展示油价信息", notes="分页查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "apiId", value = "355", required = false, dataType = "BigDecimal"),
-    })
-    @PostMapping(value = "/getOilPriceList")
-    public RESTfulResult getOilPriceList(@RequestBody(required = false) Map<String,Object> mapVal,
-                                         Integer apiId,
-                                          Integer pageNum,
-                                          Integer pageSize
-                                          ){
-        List<Map<String,Object>> list = rmsOilPriceService.getOilPriceList(mapVal);
-        PageHelper.startPage(pageNum, pageSize);
-
-        //分页查询数据
-        List<Map<String, Object>> columnList = rmsOilPriceService.getOilPriceList(mapVal);
-        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
-        return success(data);
-    }
-
     /**
      *增加新油价
      * @param rmsOilPrice
@@ -218,6 +186,4 @@ public class RmsOilPriceController extends BaseRESTfulController {
         return success(data);
     }
 
-
-
 }

target/classes/bootstrap.yml

@@ -61,4 +61,4 @@ mybatis:
     call-setters-on-nulls: true
 
 server:
-  port: 8060
+  port: 8090