修改

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

@@ -23,37 +23,48 @@ public class RMScontroller extends BaseRESTfulController {
     RmsFeign rmsFeign;
 
     @ApiOperation(value="查询所有作业环节")
-    @PostMapping("/getLineStep")
-    public Map<String, Object> getLineStep(){
-        return  rmsFeign.getLineStep();
+    @PostMapping("/getStepTypeList")
+    public Map<String, Object> getStepTypeList(){
+        return  rmsFeign.getStepTypeList();
     }
 
-    @ApiOperation(value="新增作业环节")
-    @PostMapping("/insertLineStep")
-    public Map<String,Object> insertLineStep(@RequestBody(required = false) Map<String,Object> mapValue){
-        return rmsFeign.insertLineStep(mapValue);
+    @ApiOperation(value="查询运输路线")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId", value = "249", required = false, dataType = "Integer"),
+    })
+    @PostMapping(value = "/getLineList")
+    public Map<String, Object> getLineList(@RequestBody(required = false) Map<String,Object> mapValue,
+                                           Integer pageNum,
+                                           Integer pageSize,
+                                           Integer apiId){
+        return rmsFeign.getLineList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId);
     }
 
     @ApiOperation(value="新增运输路线")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "运输路线", required = false, dataType = "Map"),
     })
-
     @PostMapping("/insertLine")
-    public Map<String, Object> insertSelective(@RequestBody(required = false) Map<String,Object> mapVal){
-        return rmsFeign.insertSelective(mapVal);
+    @LogAround(foreignKeys = {"lineId"},foreignKeyTypes = {"运输路线"})
+    public Map<String, Object> insertLine(@RequestBody(required = false) Map<String,Object> mapVal){
+        return rmsFeign.insertLine(mapVal);
     }
 
-    @ApiOperation(value="查询运输路线")
+    @ApiOperation(value="删除运输路线")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "apiId", value = "249", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "mapValue", value = "运输路线", required = false, dataType = "Map"),
     })
-    @PostMapping(value = "/getLineList")
-    public Map<String, Object> getLineList(@RequestBody(required = false) Map<String,Object> mapValue,
-                                        Integer pageNum,
-                                        Integer pageSize,
-                                        Integer apiId){
-        return rmsFeign.getLineList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId);
+    @PostMapping("/deleteLine")
+    @LogAround(foreignKeys = {"lineId"},foreignKeyTypes = {"运输路线"})
+    public Map<String, Object> deleteLine(@RequestBody(required = false) Map<String,Object> mapVal){
+        return rmsFeign.deleteLine(mapVal);
+    }
+
+    @ApiOperation(value="根据id查询线路详情", notes="")
+    @ApiImplicitParam(name = "rmsLineStep", value = "rmsLineStep", required = true, dataType = "rmsLineStep")
+    @PostMapping(value = "/getRmsLineStep/{id}")
+    public Map<String, Object> getRmsLineStep(@PathVariable("id") BigDecimal id){
+        return rmsFeign.getRmsLineStep(id);
     }
 
 

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

@@ -51,8 +51,8 @@ public class UniversalController extends BaseRESTfulController {
     private ImageFileUtils imageFileUtils;
 
     @ApiModelProperty(value = "边输边查公司单位")
-    @PostMapping("/getCompanyMesByLike")
-    public RESTfulResult getCompanyMesByLike(@RequestParam("index") String index,String companyType) {
+    @GetMapping("/getCompanyMesByLike")
+    public RESTfulResult getCompanyMesByLike(String index,String companyType) {
         Map<String,Object> map = new HashMap<>();
         map.put("index",index);
         map.put("companyType",companyType);
@@ -61,12 +61,22 @@ public class UniversalController extends BaseRESTfulController {
     }
 
     @ApiModelProperty(value = "边输边查环保标准")
-    @PostMapping("/getEmissionStandardByLike")
+    @GetMapping("/getEmissionStandardByLike")
     public RESTfulResult getEmissionStandardByLike(String index) {
         List<Map<String, Object>> list = universalMapper.getEmissionStandardByLike(index == null ? "" : index);
         return success(list);
     }
 
+    @ApiModelProperty(value = "边输边查作业点")
+    @GetMapping("/getOperationPointByLike")
+    public RESTfulResult getOperationPointByLike(String index,String operationPointType) {
+        Map<String,Object> map = new HashMap<>();
+        map.put("index",index);
+        map.put("operationPointType",operationPointType);
+        List<Map<String, Object>> list = universalMapper.getOperationPointByLike(map);
+        return success(list);
+    }
+
     @ApiOperation("上传文件通用方法,返回成功后的url")
     @PostMapping("/uploadFile")
     public RESTfulResult uploadFile(MultipartRequest request) throws Exception {

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

@@ -14,33 +14,16 @@ import java.util.Map;
 
 @FeignClient(value = "ANTAI-RMS-API", url = "${openfeign.RmsFeign.url}")
 public interface RmsFeign {
-    /**
-     * @author huk
-     * @return
-     */
-    //新增作业环节
-    @ApiOperation(value="新增作业环节")
-    @PostMapping("api/v1/rms/rmsline/insertLineStep")
-    Map<String,Object> insertLineStep(@RequestBody(required = false) Map<String,Object> mapValue);
-
-    /**
-     * @author huk
-     * @return
-     */
-    @PostMapping("/api/v1/rms/rmsline/getLineStep")
-    Map<String, Object> getLineStep();
-
-    /**
-     * @author huk
-     * @return
-     */
-    //新增运输路线
-    @ApiOperation(value="新增运输路线")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "运输路线", required = false, dataType = "Map"),
-    })
-    @PostMapping("/api/v1/rms/rmslines/insertSelective")
-    Map<String, Object> insertSelective(@RequestBody(required = false) Map<String,Object> mapVal);
+
+
+    @PostMapping("/api/v1/rms/rmslines/getStepTypeList")
+    Map<String, Object> getStepTypeList();
+
+    @PostMapping("/api/v1/rms/rmslines/insertLine")
+    Map<String, Object> insertLine(@RequestBody(required = false) Map<String,Object> mapVal);
+
+    @PostMapping("/api/v1/rms/rmslines/deleteLine")
+    Map<String, Object> deleteLine(@RequestBody(required = false) Map<String,Object> mapVal);
 
     @PostMapping(value = "/api/v1/rms/rmslines/getLineList")
     Map<String, Object> getLineList(@RequestBody(required = false) Map<String,Object> mapValue,
@@ -48,25 +31,9 @@ public interface RmsFeign {
                                         @RequestParam("pageSize")Integer pageSize,
                                         @RequestParam("apiId")Integer apiId);
 
-    @ApiOperation(value="查询线路中的门岗汽车衡", notes="分页查询")
-    @PostMapping("/api/v1/rms/rmslines/getGateCalculateMes")
-    Map<String, Object> getGateCalculateMes(@RequestParam("lineId")Integer lineId);
-
-    @ApiOperation(value = "根据主键查询出数据以供修改")
-    @PostMapping("/api/v1/rms/rmslines/getLinkToUpdate")
-    Map<String, Object> getLinkToUpdate(@RequestParam Integer lineId);
-
-    @ApiOperation(value = "根据运输线路主表ID修改数据")
-    @PostMapping("/api/v1/rms/rmslines/updateByPrimaryKeySelective")
-    Map<String, Object> updateByPrimaryKeySelective(@RequestBody(required = false) Map<String,Object> mapVal);
-
-    @ApiOperation(value = "根据运输线路主表ID修改数据,为逻辑删除")
-    @PostMapping("/api/v1/rms/rmslines/updateRmsLine")
-    Map<String, Object> updateRmsLine(@RequestBody(required = false) Map<String,Object> mapVal);
+    @PostMapping("api/v1/rms/rmslines/getRmsLineStep/{id}")
+    Map<String, Object> getRmsLineStep(@PathVariable("id") BigDecimal id);
 
-    @ApiOperation(value = "根据运输路线的主表id查询运输订单是否相关联")
-    @PostMapping("/api/v1/rms/rmslines/getCountNumber")
-    Map<String, Object> getCountNumber(@RequestParam Integer lineId);
 
     //********************************************************************************************************
 

src/main/java/com/steerinfo/dil/mapper/UniversalMapper.java

@@ -19,6 +19,10 @@ public interface UniversalMapper {
     //边输边查发货单位
     List<Map<String, Object>> getCompanyMesByLike(Map<String, Object> map);
 
+    List<Map<String, Object>> getEmissionStandardByLike(String s);
+
+    List<Map<String, Object>> getOperationPointByLike(Map<String, Object> map);
+
 
     List<String> getColumnNoRoutList(Map<String, Object> map);
 
@@ -32,5 +36,5 @@ public interface UniversalMapper {
 
     String getWlUrl();
 
-    List<Map<String, Object>> getEmissionStandardByLike(String s);
+
 }

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

@@ -120,7 +120,7 @@
         <if test="index!=null and index!=''">
         AND   REGEXP_LIKE(RC.COMPANY_NAME, #{index})
         </if>
-        FETCH NEXT 10 ROWS ONLY
+        FETCH NEXT 100 ROWS ONLY
     </select>
     <select id="getEmissionStandardByLike" resultType="java.util.Map">
         select
@@ -134,5 +134,20 @@
         <if test="index!=null and index!=''">
             AND   REGEXP_LIKE(EMISSION_STANDARD_NAME, #{index})
         </if>
+        FETCH NEXT 100 ROWS ONLY
+    </select>
+    <select id="getOperationPointByLike" resultType="java.util.Map">
+        select
+        OPERATION_POINT_ID "operationPointId",
+        OPERATION_POINT_NAME "operationPointName",
+        OPERATION_POINT_ID "id",
+        OPERATION_POINT_ID "value",
+        OPERATION_POINT_NAME "label"
+        from RMS_OPERATION_POINT
+        where DELETED = 0
+        <if test="index!=null and index!=''">
+            AND   REGEXP_LIKE(OPERATION_POINT_NAME, #{index})
+        </if>
+        FETCH NEXT 100 ROWS ONLY
     </select>
 </mapper>