修改

src/main/java/com/steerinfo/dil/config/ImageFileUtils.java

@@ -111,7 +111,7 @@ public class ImageFileUtils implements FileUtils {
         //上传文件夹路径
         List<String> urls=new ArrayList<>();
         for (int i=0;i<files.length;i++){
-            String url = UploadUtils.uploadFile(files[i], new IdGenerator(i, 10), path, File.separator+year+ File.separator+month+ File.separator+day+ File.separator);
+            String url = UploadUtils.uploadFile(files[i], path, File.separator+year+ File.separator+month+ File.separator+day+ File.separator);
             urls.add(url);
         }
         return urls;
@@ -130,7 +130,7 @@ public class ImageFileUtils implements FileUtils {
         int year = calendar.get(Calendar.YEAR);
         int month = calendar.get(Calendar.MONTH);
         int day= calendar.get(Calendar.DAY_OF_MONTH);
-        String url = filePrefix + UploadUtils.uploadFile(file, new IdGenerator(workerId%31, 10), path, File.separator+year+ File.separator+month+ File.separator+day+ File.separator);
+        String url = filePrefix + UploadUtils.uploadFile(file, path, File.separator+year+ File.separator+month+ File.separator+day+ File.separator);
         return url;
     }
 

src/main/java/com/steerinfo/dil/config/RequestFilter.java

@@ -27,7 +27,7 @@ public class RequestFilter implements Filter {
     public void doFilter(ServletRequest request, ServletResponse response,FilterChain chain) throws IOException, ServletException {
        try{
             HttpServletRequest httpRequest = (HttpServletRequest)request;
-            //有请求限制注解，获取参数，并校验
+            //获取参数，并校验
             Cookie[] cookies = httpRequest.getCookies();
             String userId = null;
             String userName = null;

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

@@ -335,14 +335,16 @@ public class RMScontroller extends BaseRESTfulController {
     @ApiOperation(value="新增运力信息", notes="根据rmsCapacity对象创建")
     @ApiImplicitParam(name = "rmsCapacity", value = "详细实体rmsCapacity", required = true, dataType = "rmsCapacity")
     @PostMapping(value = "/insertCapacity")
+    @LogAround(foreignKeys = {"capacityId"},foreignKeyTypes = {"运力"})
     public Map<String, Object> insertCapacity(@RequestBody(required = false) Map<String, Object> map){
         return rmsFeign.insertCapacity(map);
     }
     @ApiOperation(value="删除", notes="根据rmsCarrier对象创建")
     @ApiImplicitParam(name = "运力id", value = "id", required = true, dataType = "int")
-    @PostMapping(value = "/deleteCapacity/{id}")
-    public Map<String, Object> deleteCapacity(@PathVariable("id")BigDecimal id){
-        return rmsFeign.deleteCapacity(id);
+    @PostMapping(value = "/deleteCapacity")
+    @LogAround(foreignKeys = {"capacityId"},foreignKeyTypes = {"运力"})
+    public Map<String, Object> deleteCapacity(@RequestBody(required = false) Map<String, Object> map){
+        return rmsFeign.deleteCapacity(map);
     }
 
     @ApiOperation(value="获取运力详细信息", notes="根据url的id来获取详细信息")
@@ -357,8 +359,8 @@ public class RMScontroller extends BaseRESTfulController {
             @ApiImplicitParam(name = "rmsCapacity", value = "详细实体rmsCapacity", required = true, dataType = "RmsCapacity")
     })
     @PostMapping(value = "/updateCapacity", produces  = "application/json;charset=UTF-8")
+    @LogAround(foreignKeys = {"capacityId"},foreignKeyTypes = {"运力"})
     public Map<String, Object> updateCapacity( @RequestBody Map<String, Object> map){
-
         return rmsFeign.updateCapacity(map);
     }
     @PostMapping("/getCapacityList")
@@ -731,24 +733,25 @@ public class RMScontroller extends BaseRESTfulController {
     public Map<String, Object> getCapacityType(@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.getCapacityType(map,apiId,pageNum,pageSize,con);
+        return rmsFeign.getCapacityType(map,apiId,pageNum,pageSize);
     }
 
     @ApiOperation(value="新增运力类型")
     @PostMapping(value = "/insertCapacityType")
+    @LogAround(foreignKeys = {"capacityTypeId"},foreignKeyTypes = {"运力类型"})
     public Map<String, Object> insertCapacityType(@RequestBody(required = false) Map<String, Object> map){
         return rmsFeign.insertCapacityType(map);
     }
 
     @ApiOperation(value="删除运力类型")
-    @PostMapping(value = "/deleteCapacityType/{id}")
-    public Map<String, Object> deleteCapacityType(@PathVariable("id")BigDecimal id){
-        return rmsFeign.deleteCapacityType(id);
+    @PostMapping(value = "/deleteCapacityType")
+    @LogAround(foreignKeys = {"capacityTypeId"},foreignKeyTypes = {"运力类型"})
+    public Map<String, Object> deleteCapacityType(@RequestBody(required = false) Map<String, Object> map){
+        return rmsFeign.deleteCapacityType(map);
     }
 
     @ApiOperation(value = "查询运输范围")

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

@@ -27,10 +27,7 @@ import java.io.IOException;
 import java.io.OutputStream;
 import java.math.BigDecimal;
 import java.net.URLEncoder;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * @ author    :TXF
@@ -55,23 +52,26 @@ public class UniversalController extends BaseRESTfulController {
 
     @ApiModelProperty(value = "边输边查公司单位")
     @PostMapping("/getCompanyMesByLike")
-    public RESTfulResult getCompanyMesByLike(@RequestParam("index") String index) {
-        List<Map<String, Object>> list = universalMapper.getCompanyMesByLike(index == null ? "" : index);
+    public RESTfulResult getCompanyMesByLike(@RequestParam("index") String index,String companyType) {
+        Map<String,Object> map = new HashMap<>();
+        map.put("index",index);
+        map.put("companyType",companyType);
+        List<Map<String, Object>> list = universalMapper.getCompanyMesByLike(map);
         return success(list);
     }
 
     @ApiModelProperty(value = "边输边查环保标准")
     @PostMapping("/getEmissionStandardByLike")
-    public RESTfulResult getEmissionStandardByLike(@RequestParam("index") String index) {
+    public RESTfulResult getEmissionStandardByLike(String index) {
         List<Map<String, Object>> list = universalMapper.getEmissionStandardByLike(index == null ? "" : index);
         return success(list);
     }
 
     @ApiOperation("上传文件通用方法,返回成功后的url")
     @PostMapping("/uploadFile")
-    public String uploadFile(MultipartRequest request) throws Exception {
+    public RESTfulResult uploadFile(MultipartRequest request) throws Exception {
         //添加到files数组,单次最大允许100
-        List<MultipartFile> files = new ArrayList<>();
+        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){
@@ -82,15 +82,20 @@ public class UniversalController extends BaseRESTfulController {
         }
         //没有上传
         if(files.size() == 0){
-            return  "";
+            return  failed("","没有上传任何文件！");
         }
-        //上传图片,拼接在一个url里
-        String url="";
-        for (int i=0;i<files.size();i++){
-            MultipartFile file=files.get(i);
-            url += imageFileUtils.updateFile(file,i)+';';
+        try{
+            //上传图片,拼接在一个url里
+            String url="";
+            for (int i=0;i<files.size();i++){
+                MultipartFile file=files.get(i);
+                url += imageFileUtils.updateFile(file,i + new Date().getTime())+';';
+            }
+            return success(url,"上传成功！");
+        }catch (Exception e){
+            e.printStackTrace();
+            return  failed(e.getMessage(),"上传失败！");
         }
-        return url;
     }
 
 

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

@@ -1,4 +1,5 @@
 package com.steerinfo.dil.feign;
+import com.steerinfo.dil.annotaion.LogAround;
 import com.steerinfo.framework.controller.RESTfulResult;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -197,8 +198,8 @@ public interface RmsFeign {
     @PostMapping(value = "api/v1/rms/rmscapacity/insertCapacity")
     Map<String, Object> insertCapacity(@RequestBody(required = false) Map<String, Object> map);
     //删除运力
-    @PostMapping(value = "api/v1/rms/rmscapacity/deleteCapacity/{id}")
-    Map<String, Object> deleteCapacity(@PathVariable("id") BigDecimal id);
+    @PostMapping(value = "api/v1/rms/rmscapacity/deleteCapacity")
+    Map<String, Object> deleteCapacity(@RequestBody(required = false) Map<String, Object> map);
     //修改运力
     @PostMapping(value = "api/v1/rms/rmscapacity/updateCapacity")
     Map<String, Object> updateCapacity(Map<String, Object> map);
@@ -499,14 +500,13 @@ public interface RmsFeign {
     Map<String, Object> getCapacityType(@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);
 
     @PostMapping(value = "api/v1/rms/rmscapacitytype/insertCapacityType")
     Map<String, Object> insertCapacityType(@RequestBody(required = false) Map<String, Object> map);
 
-    @PostMapping(value = "api/v1/rms/rmscapacitytype/deleteCapacityType/{id}")
-    Map<String, Object> deleteCapacityType(@PathVariable("id") BigDecimal id);
+    @PostMapping(value = "api/v1/rms/rmscapacitytype/deleteCapacityType")
+    Map<String, Object> deleteCapacityType(@RequestBody(required = false) Map<String, Object> map);
 
     //运输范围
     @PostMapping(value = "/api/v1/rms/rmscapacitytype/getTransRange")

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

@@ -17,7 +17,7 @@ import java.util.Map;
 public interface UniversalMapper {
 
     //边输边查发货单位
-    List<Map<String, Object>> getCompanyMesByLike(String index);
+    List<Map<String, Object>> getCompanyMesByLike(Map<String, Object> map);
 
 
     List<String> getColumnNoRoutList(Map<String, Object> map);

src/main/java/com/steerinfo/dil/util/UploadUtils.java

@@ -22,10 +22,12 @@ import java.io.IOException;
  */
 
     public class UploadUtils {
+        public  static IdGenerator idGenerator = new IdGenerator(1,1);
+
         public UploadUtils() {
         }
 
-        public static String uploadFile(MultipartFile file, IdGenerator idGenerator, String uploadPath, String imgPath) {
+        public static String uploadFile(MultipartFile file, String uploadPath, String imgPath) {
             String profilePhoto = null;
             if (file != null) {
                 String fileId = idGenerator.getNextStr();

src/main/resources/bootstrap.yml

@@ -43,7 +43,5 @@ mybatis:
 filePath: \data\file
 #前缀
 prefix:
-  logPrefix: E:\logs\log\running.log.
-  #  logPrefix: \data\antai-api\running.log.
-  filePrefix: \data\file
-#  filePrefix: http://172.16.90.214
+  logPrefix: \data\antai-api\running.log.
+  filePrefix: http://172.16.90.214

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

@@ -105,7 +105,7 @@
 
 
     <!--  边输边查公司  -->
-    <select id="getCompanyMesByLike" parameterType="string" resultType="java.util.Map">
+    <select id="getCompanyMesByLike" resultType="java.util.Map">
         select
             RC.COMPANY_ID "companyId",
             RC.COMPANY_NAME "value",
@@ -113,20 +113,26 @@
             RC.SSO_ID "ssoId",
             RC.SSO_CODE "ssoCode"
         from RMS_COMPANY RC
-        where instr(RC.COMPANY_NAME, #{index}) > 0
-        and DELETED = 0
-        order by RC.COMPANY_ID
+        where DELETED = 0
+        <if test="companyType!=null and companyType!=''">
+         AND   RC.COMPANY_TYPE = #{companyType}
+        </if>
+        <if test="index!=null and index!=''">
+            AND    REGEX_LIKE(RC.COMPANY_NAME, #{index})
+        </if>
         FETCH NEXT 10 ROWS ONLY
     </select>
     <select id="getEmissionStandardByLike" resultType="java.util.Map">
         select
             EMISSION_STANDARD_ID "emissionStandardId",
             EMISSION_STANDARD_NAME "emissionStandardName",
+            EMISSION_STANDARD_ID "id",
             EMISSION_STANDARD_ID "value",
             EMISSION_STANDARD_NAME "label"
         from RMS_EMISSION_STANDARD
-        where instr(EMISSION_STANDARD_NAME, #{index}) > 0
-        and DELETED = 0
-        FETCH NEXT 10 ROWS ONLY
+        where DELETED = 0
+        <if test="index!=null and index!=''">
+            AND   REGEX_LIKE(EMISSION_STANDARD_NAME, #{index})
+        </if>
     </select>
 </mapper>