修改

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

@@ -24,83 +24,51 @@ public class RMScontroller extends BaseRESTfulController {
     @Autowired
     RmsFeign rmsFeign;
 
-    /**
-     * @author huk
-     * @return
-     */
-    //查询所有作业环节
     @ApiOperation(value="查询所有作业环节")
-    @PostMapping("/getLink")
-    public Map<String, Object> getlink(){
-        return  rmsFeign.getlink();
+    @PostMapping("/getStepTypeList")
+    public Map<String, Object> getStepTypeList(){
+        return  rmsFeign.getStepTypeList();
     }
 
-    /**
-     * @author huk
-     * @return
-     */
-    //新增运输路线
-    @ApiOperation(value="新增运输路线")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "运输路线", required = false, dataType = "Map"),
-    })
-    @PostMapping("/insertSelective")
-    public Map<String, Object> insertSelective(@RequestBody(required = false) Map<String,Object> mapVal){
-        return rmsFeign.insertSelective(mapVal);
-    }
-
-
     @ApiOperation(value="查询运输路线")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "apiId", value = "249", required = false, dataType = "Integer"),
     })
-    @PostMapping(value = "/getAllLineDesk")
-    public Map<String, Object> getAllLineDesk(@RequestBody(required = false) Map<String,Object> mapValue,
-                                        Integer pageNum,
-                                        Integer pageSize,
-                                        Integer apiId,
-                                        Integer lineType,
-                                        String con){
-        return rmsFeign.getAllLineDesk(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId, lineType, con);
-    }
-
-
-    @ApiOperation(value="删除数据为了内转")
-    @PostMapping("/getGateCalculateMes")
-    public Map<String, Object> getGateCalculateMes(@RequestParam Integer lineId){
-        return rmsFeign.getGateCalculateMes(lineId);
+    @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 = "根据主键查询出数据以供修改")
-    @PostMapping("/getLinkToUpdate")
-    public Map<String, Object> getLinkToUpdate(@RequestParam Integer lineId) {
-        return rmsFeign.getLinkToUpdate(lineId);
-    }
-
-    @ApiOperation(value = "根据运输线路主表ID修改数据")
-    @PostMapping("/updateByPrimaryKeySelective")
-    public Map<String, Object> updateByPrimaryKeySelective(@RequestBody(required = false) Map<String,Object> mapVal) {
-        return rmsFeign.updateByPrimaryKeySelective(mapVal);
+    @ApiOperation(value="新增运输路线")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "运输路线", required = false, dataType = "Map"),
+    })
+    @PostMapping("/insertLine")
+    @LogAround(foreignKeys = {"lineId"},foreignKeyTypes = {"运输路线"})
+    public Map<String, Object> insertLine(@RequestBody(required = false) Map<String,Object> mapVal){
+        return rmsFeign.insertLine(mapVal);
     }
 
-    @ApiOperation(value = "根据运输线路主表ID修改数据,为逻辑删除")
-    @PostMapping("/updateRmsLine")
-    Map<String, Object> updateRmsLine(@RequestBody(required = false) Map<String,Object> mapVal){
-        return  rmsFeign.updateRmsLine(mapVal);
+    @ApiOperation(value="删除运输路线")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "运输路线", required = false, dataType = "Map"),
+    })
+    @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查询运输订单是否相关联")
-    @PostMapping("/getCountNumber")
-    public Map<String, Object> getCountNumber(@RequestParam Integer lineId) {
-        return rmsFeign.getCountNumber(lineId);
+    @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);
     }
 
-    //查询所有作业环节
-    @ApiOperation(value="新增作业环节")
-    @PostMapping("/LinkInsertSelective")
-    public Map<String,Object> LinkInsertSelective(@RequestBody(required = false) Map<String,Object> mapValue){
-        return rmsFeign.LinkInsertSelective(mapValue);
-    }
 
     //================物资类型
     @PostMapping("/getMaterialTypeList")
@@ -351,9 +319,9 @@ public class RMScontroller extends BaseRESTfulController {
 
     @ApiOperation(value="获取运力详细信息", notes="根据url的id来获取详细信息")
     @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal")
-    @PostMapping(value = "/getCapacityById/{id}")
-    public Map<String,Object> getCapacityById(@PathVariable("id")BigDecimal id){
-        return rmsFeign.getCapacityById(id);
+    @PostMapping(value = "/getCapacityById")
+    public Map<String,Object> getCapacityById(@RequestBody Map<String, Object> map){
+        return rmsFeign.getCapacityById(map);
     }
     @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象，并根据传过来的rmsCapacity信息来更新详细信息")
     @ApiImplicitParams({
@@ -536,23 +504,6 @@ public class RMScontroller extends BaseRESTfulController {
         return rmsFeign.getCapacityTypeId();
     }
 
-    @GetMapping(value = "getWarehouseTypeId")
-    @ApiOperation(value = "获取原料仓库类型下拉id")
-    public Map<String, Object> getWarehouseTypeId(){
-        return rmsFeign.getWarehouseTypeId();
-    }
-
-    @GetMapping(value = "getPortId")
-    @ApiOperation(value = "获取港存库所属港口下拉id")
-    public Map<String, Object> getPortId(){
-        return rmsFeign.getPortId();
-    }
-
-    @GetMapping(value="getCarrierId")
-    @ApiOperation(value = "获取公司下拉id")
-    public Map<String,Object> getCarrierId(){
-        return rmsFeign.getCarrierId();
-    }
 
     @GetMapping("getMaterialTypeId")
     @ApiOperation(value = "得到下拉物资类型id")
@@ -560,23 +511,6 @@ public class RMScontroller extends BaseRESTfulController {
         return rmsFeign.getMaterialTypeId();
     }
 
-    @GetMapping("getUnitOfMeasureId")
-    @ApiOperation(value = "得到下拉计量id")
-    public Map<String, Object> getUnitOfMeasureId() {
-        return rmsFeign.getUnitOfMeasureId();
-    }
-
-    @GetMapping("getShipperId")
-    @ApiOperation(value = "得到下拉托运人id")
-    public Map<String, Object> getShipperId() {
-        return rmsFeign.getShipperId();
-    }
-
-    @GetMapping("getGatepostRulesId")
-    @ApiOperation(value = "得到下拉门岗规则id")
-    public Map<String, Object> getGatepostRulesId() {
-        return rmsFeign.getGatepostRulesId();
-    }
 
     @GetMapping("getTransportTypeId")
     @ApiOperation(value = "运输类型下拉")
@@ -584,20 +518,7 @@ public class RMScontroller extends BaseRESTfulController {
         return rmsFeign.getTransportTypeId();
     }
 
-    @GetMapping("/getVehicleTypeId")
-    @ApiOperation(value = "得到下拉车辆类型id")
-    public Map<String, Object> getVehicleTypeId() {
-        return rmsFeign.getVehicleTypeId();
-    }
-    //通知
-    @ApiOperation(value = "获取公告信息", notes = "分页查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
-    })
+
     @PostMapping(value = "/getNoticeList")
     public Map<String, Object> getNoticeList(@RequestBody(required = false) Map<String, Object> mapValue,
                                              Integer apiId,
@@ -757,20 +678,20 @@ public class RMScontroller extends BaseRESTfulController {
     }
 
     @ApiOperation(value = "查询运输范围")
-    @PostMapping("/getTransRange")
-    public Map<String, Object> getTransRange(@RequestBody(required = false) Map<String,Object> map,
+    @PostMapping("/getTransRangeList")
+    public Map<String, Object> getTransRangeList(@RequestBody(required = false) Map<String,Object> map,
                                                Integer apiId,
                                                Integer pageNum,
-                                               Integer pageSize,
-                                               String con) {
+                                               Integer pageSize) {
         if(map==null){
             map=new HashMap<>();
         }
-        return rmsFeign.getTransRange(map,apiId,pageNum,pageSize,con);
+        return rmsFeign.getTransRangeList(map,apiId,pageNum,pageSize);
     }
 
     @ApiOperation(value="新增运输范围")
     @PostMapping(value = "/insertTransRange")
+    @LogAround(foreignKeys = {"transRangeId"},foreignKeyTypes = "运输范围")
     public Map<String, Object> insertTransRange(@RequestBody(required = false) Map<String, Object> map){
         return rmsFeign.insertTransRange(map);
     }

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,28 +61,30 @@ 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 {
-        //添加到files数组,单次最大允许100
-        List<MultipartFile> files = request.getFiles("file")!=null? request.getFiles("file") : new ArrayList<>();
-        for(int i=0;i<100;i++){
-            MultipartFile file = request.getFile("file"+i);
-            if(file!=null){
-                files.add(file);
-            }else{
-                break;
-            }
-        }
+        //添加到files数组
+        List<MultipartFile> files = request.getFiles("file");
         //没有上传
         if(files.size() == 0){
-            return  failed("","没有上传任何文件！");
+            return  success("","没有上传任何文件！");
         }
         try{
             //上传图片,拼接在一个url里

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

@@ -15,61 +15,26 @@ 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/rmslinks/LinkInsertSelective")
-    Map<String,Object> LinkInsertSelective(@RequestBody(required = false) Map<String,Object> mapValue);
 
-    /**
-     * @author huk
-     * @return
-     */
-    @PostMapping("/api/v1/rms/rmslinks/getLink")
-    Map<String, Object> getlink();
 
-    /**
-     * @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(value = "/api/v1/rms/rmslines/getAllLineDesk")
-    Map<String, Object> getAllLineDesk(@RequestBody(required = false) Map<String,Object> mapValue,
-                                        @RequestParam("pageNum") Integer pageNum,
-                                        @RequestParam("pageSize")Integer pageSize,
-                                        @RequestParam("apiId")Integer apiId,
-                                        @RequestParam("lineType")Integer lineType,
-                                        @RequestParam("con")String con);
+    @PostMapping("/api/v1/rms/rmslines/getStepTypeList")
+    Map<String, Object> getStepTypeList();
 
-    @ApiOperation(value="查询线路中的门岗汽车衡", notes="分页查询")
-    @PostMapping("/api/v1/rms/rmslines/getGateCalculateMes")
-    Map<String, Object> getGateCalculateMes(@RequestParam("lineId")Integer lineId);
+    @PostMapping("/api/v1/rms/rmslines/insertLine")
+    Map<String, Object> insertLine(@RequestBody(required = false) Map<String,Object> mapVal);
 
-    @ApiOperation(value = "根据主键查询出数据以供修改")
-    @PostMapping("/api/v1/rms/rmslines/getLinkToUpdate")
-    Map<String, Object> getLinkToUpdate(@RequestParam Integer lineId);
+    @PostMapping("/api/v1/rms/rmslines/deleteLine")
+    Map<String, Object> deleteLine(@RequestBody(required = false) Map<String,Object> mapVal);
 
-    @ApiOperation(value = "根据运输线路主表ID修改数据")
-    @PostMapping("/api/v1/rms/rmslines/updateByPrimaryKeySelective")
-    Map<String, Object> updateByPrimaryKeySelective(@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,
+                                        @RequestParam("pageNum") Integer pageNum,
+                                        @RequestParam("pageSize")Integer pageSize,
+                                        @RequestParam("apiId")Integer apiId);
 
-    @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);
 
     //********************************************************************************************************
 
@@ -216,8 +181,8 @@ public interface RmsFeign {
                                         @RequestParam String carrierSSOId);
 
     //根据id获取运力详细信息
-    @PostMapping(value = "api/v1/rms/rmscapacity/getCapacityById/{id}")
-    Map<String,Object> getCapacityById(@PathVariable("id") BigDecimal id);
+    @PostMapping(value = "api/v1/rms/rmscapacity/getCapacityById")
+    Map<String,Object> getCapacityById(@RequestBody Map<String, Object> map);
 
     //==============仓库
     //新增仓库
@@ -510,12 +475,12 @@ public interface RmsFeign {
     Map<String, Object> deleteCapacityType(@RequestBody(required = false) Map<String, Object> map);
 
     //运输范围
-    @PostMapping(value = "/api/v1/rms/rmscapacitytype/getTransRange")
-    Map<String, Object> getTransRange(@RequestBody(required = false) Map<String,Object> map,
+    @PostMapping(value = "/api/v1/rms/rmstransrange/getTransRangeList")
+    Map<String, Object> getTransRangeList(@RequestBody(required = false) Map<String,Object> map,
                                         @RequestParam("apiId") Integer apiId,
                                         @RequestParam("pageNum") Integer pageNum,
-                                        @RequestParam("pageSize") Integer pageSize,
-                                        @RequestParam("con") String con);
+                                        @RequestParam("pageSize") Integer pageSize);
+
 
     /**
      * 集装箱的相关方法

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/java/com/steerinfo/dil/util/UploadUtils.java

@@ -1,10 +1,12 @@
 package com.steerinfo.dil.util;
 
 import com.google.common.io.Files;
+import com.steerinfo.dil.aspect.LogAspect;
 import com.steerinfo.framework.exception.BaseException;
 import com.steerinfo.framework.utils.io.FileUtils;
 import com.steerinfo.framework.utils.misc.IdGenerator;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.log4j.Logger;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.imageio.ImageIO;
@@ -23,6 +25,7 @@ import java.io.IOException;
 
     public class UploadUtils {
         public  static IdGenerator idGenerator = new IdGenerator(1,1);
+        private static final Logger log = Logger.getLogger(UploadUtils.class);
 
         public UploadUtils() {
         }

src/main/resources/bootstrap.yml

@@ -40,8 +40,8 @@ mybatis:
     call-setters-on-nulls: true
 
 #文件保存路径
-filePath: \data\file
+filePath: /data/file
 #前缀
 prefix:
-  logPrefix: \data\antai-api\running.log.
+  logPrefix: http://172.16.90.214/data/antai-api/logs/log/running.log.
   filePrefix: http://172.16.90.214

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

@@ -118,9 +118,9 @@
          AND   RC.COMPANY_TYPE = #{companyType}
         </if>
         <if test="index!=null and index!=''">
-            AND    REGEX_LIKE(RC.COMPANY_NAME, #{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
@@ -132,7 +132,22 @@
         from RMS_EMISSION_STANDARD
         where DELETED = 0
         <if test="index!=null and index!=''">
-            AND   REGEX_LIKE(EMISSION_STANDARD_NAME, #{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>