“修改

pom.xml

@@ -115,6 +115,30 @@
     </dependencies>
     <build>
         <plugins>
+            <!--             自动生成代码文件 -->
+            <plugin>
+                <groupId>com.steerinfo</groupId>
+                <artifactId>generator-maven-plugin</artifactId>
+                <version>3.0</version>
+                <configuration>
+                    <connUrl>jdbc:oracle:thin:@172.16.90.214:1521/gxmes</connUrl>
+                    <user>gxmestest</user>
+                    <password>gxmestest</password>
+                    <!--包名-->
+                    <targetPackage>com.steerinfo.dil</targetPackage>
+                    <tables>
+                        <param>LOG_RESULT</param>
+                    </tables>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>steerinfo</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>

src/main/java/com/steerinfo/dil/annotaion/LogAround.java

@@ -0,0 +1,15 @@
+package com.steerinfo.dil.annotaion;
+
+import java.lang.annotation.*;
+
+/**
+ * 日志注解，打印方法输入输出，并记录到数据库
+ */
+@Documented
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface LogAround {
+    String[] foreignKeys();//日志表外键
+    String[] foreignKeyTypes();//日志表外键类型
+    String description() default "无";//日志描述
+}

src/main/java/com/steerinfo/dil/annotaion/RequestLimit.java

@@ -0,0 +1,14 @@
+package com.steerinfo.dil.annotaion;
+
+import java.lang.annotation.*;
+
+/**
+ * 请求限制注解，防止更新重复提交
+ */
+@Target({ElementType.METHOD, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface RequestLimit {
+    int seconds() default 3;//秒
+    int maxCount() default 1;//最大访问次数
+}

src/main/java/com/steerinfo/dil/aspect/LogAspect.java

@@ -0,0 +1,140 @@
+package com.steerinfo.dil.aspect;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.steerinfo.dil.annotaion.LogAround;
+import com.steerinfo.dil.mapper.LogResultMapper;
+import com.steerinfo.dil.model.LogResult;
+import com.steerinfo.dil.util.DataChange;
+import com.steerinfo.framework.controller.RESTfulResult;
+import org.apache.log4j.Logger;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.Signature;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Pointcut;
+import org.aspectj.lang.reflect.MethodSignature;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+import java.lang.reflect.Method;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 日志 Aspect切面,编写切入点的方法
+ */
+@Aspect
+@Component
+public class LogAspect {
+    @Value("${prefix.logPrefix}")
+    private String logPrefix;
+    @Autowired
+    LogResultMapper logResultMapper;
+
+    static final Logger log = Logger.getLogger(LogAspect.class);
+
+    private DateFormat format =new SimpleDateFormat("yyyy-MM-dd");
+
+
+    /**
+     * 定义切入点，所有该注解为切入点
+     */
+    @Pointcut("@annotation(com.steerinfo.dil.annotaion.LogAround)")
+    public void AroundPointCut(){}
+
+    /**
+     * 环绕通知 @Around，日志文件同时记录方法的入参出参，数据库只保留成功的出参
+     * @param point
+     * @return
+     *
+     * @throws Throwable
+     */
+    @Around("AroundPointCut()")
+    public Object around(ProceedingJoinPoint point) throws Throwable {
+        //获取该切点处的方法及入参
+        Method method = ((MethodSignature) point.getSignature()).getMethod();
+        Object[] requestParams = point.getArgs();
+        JSONObject map = null ;
+        for(Object param:requestParams){
+            if(param!=null && param instanceof Map){
+                map = JSONObject.parseObject(JSONObject.toJSONString(param));
+                break;
+            }
+        }
+        if(map==null || map.get("userId")==null ||map.get("userName") ==null){
+            log.error("缺乏日志必要参数"+requestParams);
+            return new RESTfulResult("500","缺乏日志必要参数"+requestParams,"缺乏日志必要参数"+requestParams);
+        }
+        //获取切点处的注解及其参数
+        LogAround logAround = method.getAnnotation(LogAround.class);
+        String[] foreignKeys = logAround.foreignKeys();
+        String[] foreignKeyTypes = logAround.foreignKeyTypes();
+        String description = logAround.description();
+        //获取方法签名
+        Signature signature = point.getSignature();
+        String methodName = method.getName();
+        log.info("执行===" + methodName + "===开始");
+        log.info("方法描述：" + description);
+        log.info("方法名：" + signature);
+        log.info("方法参数：" + requestParams);
+        //记录当前时间
+        Date beginTime = new Date();
+        //执行方法，并取得返回值
+        Object response = null;
+        try{
+            response = point.proceed();
+        }catch (Exception e){
+            //记录错误日志
+            log.error("执行===" + methodName + "===异常："+ e.getClass().getName());
+            log.error("方法描述：" + description);
+            log.error("方法名：" + signature);
+            log.error("方法参数：" + requestParams);
+            throw e;
+        }
+        //解析返回值，记录日志
+        try{
+            RESTfulResult result = JSONObject.parseObject(JSONObject.toJSONString(response),RESTfulResult.class);
+            if(RESTfulResult.SUCCEED.equals(result.getStatus())){
+                //执行成功，记录日志
+                Map<String,Object> data =(Map<String,Object>) result.getData();
+                //获取执行时间
+                long exeCost = System.currentTimeMillis() - beginTime.getTime();
+                //记录正常日志
+                log.info("方法返回：" + JSON.toJSONString(result));
+                log.info("执行时间（ms）："+exeCost);
+                log.info("执行===" + methodName + "===结束");
+                //记录到数据库
+                List<LogResult> logResults=new ArrayList<>();
+                for(int i=0 ; i<foreignKeys.length ; i++){
+                    LogResult logResult=new LogResult();
+                    logResult.setLogId(logResultMapper.nextId());
+                    logResult.setForeignKeyId(DataChange.dataToBigDecimal(data.get(foreignKeys[i])));
+                    logResult.setForeignKeyType(foreignKeyTypes[i]);
+                    logResult.setLogContent(map.get("userName")+":"+result.getMessage());
+                    logResult.setMethodName(""+signature);
+                    logResult.setMethodDescription(description);
+                    logResult.setInsertTime(beginTime);
+                    logResult.setExeCost(DataChange.dataToBigDecimal(exeCost));
+                    logResult.setFilePath(logPrefix+format.format(beginTime));
+                    logResult.setInsertUsername(""+map.get("userId"));
+                    logResult.setRemark("自动记录");
+                    log.info("logResult:\n"+logResult);
+                    logResults.add(logResult);
+                }
+                logResultMapper.batchInsert(logResults);
+            }else{
+
+            }
+        }catch (Exception e){
+            //记录错误日志
+            log.error("===日志解析、记录失败===：\n"+ e.getMessage());
+        }
+        return response;
+    }
+}

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

@@ -0,0 +1,74 @@
+package com.steerinfo.dil.config;
+
+
+import com.alibaba.fastjson.JSONObject;
+import com.steerinfo.dil.aspect.LogAspect;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
+import javax.servlet.*;
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.URLDecoder;
+import java.util.HashMap;
+import java.util.Map;
+
+@Component
+public class RequestFilter implements Filter {
+    static final Logger log = Logger.getLogger(RequestFilter.class);
+
+    @Override
+    public void destroy() {}
+
+    @Override
+    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;
+            //获取cookie用户数据
+            for (Cookie cookie : cookies) {
+                if (userId==null && cookie.getName().equals("userId")) {
+                    userId = cookie.getValue();
+                }else if(userName==null && cookie.getName().equals("userName")){
+                    userName = cookie.getValue();
+                }else if(userId!=null && userName!=null){
+                    //都查到了，退出
+                    break;
+                }
+            }
+            httpRequest.setAttribute("userId",userId);
+            httpRequest.setAttribute("userName", URLDecoder.decode(userName,"utf-8"));
+            //获取RequestBody数据
+            BufferedReader streamReader = new BufferedReader( new InputStreamReader(request.getInputStream(), "UTF-8"));
+            StringBuilder strBuilder = new StringBuilder();
+            String inputStr;
+            while ((inputStr = streamReader.readLine()) != null) {
+                strBuilder.append(inputStr);
+            }
+            if(strBuilder!=null && !"".equals(strBuilder.toString())){
+                //有请求体则写入userId和userName，保存
+                JSONObject params = JSONObject.parseObject(strBuilder.toString());
+                params.put("userId",userId);
+                params.put("userName",userName);
+                //将新的RequestBody写入新的请求对象保存
+                ServletRequest requestWrapper = new RequestWrapper(httpRequest, params.toJSONString());
+                chain.doFilter(requestWrapper, response);
+            }else{
+                chain.doFilter(request, response);
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            log.error(e.getStackTrace());
+            chain.doFilter(request, response);
+        }
+    }
+    @Override
+    public void init(FilterConfig arg0) throws ServletException {}
+}
+

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

@@ -0,0 +1,56 @@
+package com.steerinfo.dil.config;
+
+import javax.servlet.ReadListener;
+import javax.servlet.ServletInputStream;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletRequestWrapper;
+import java.io.*;
+
+// 继承 HttpServletRequestWrapper 可以重写 InputStream
+public class RequestWrapper extends HttpServletRequestWrapper {
+    //保存请求数据
+    private final String body;
+
+    public RequestWrapper(HttpServletRequest request,String body){
+        super(request);
+        this.body = body;
+    }
+
+    /**
+     * 重写流
+     * @return
+     * @throws IOException
+     */
+    @Override
+    public ServletInputStream getInputStream() throws IOException {
+        final ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream(body.getBytes());
+        ServletInputStream servletInputStream = new ServletInputStream() {
+            @Override
+            public boolean isFinished() {
+                return false;
+            }
+            @Override
+            public boolean isReady() {
+                return false;
+            }
+            @Override
+            public void setReadListener(ReadListener readListener) {
+            }
+            @Override
+            public int read() throws IOException {
+                return byteArrayInputStream.read();
+            }
+        };
+        return servletInputStream;
+    }
+
+    @Override
+    public BufferedReader getReader() throws IOException {
+        return new BufferedReader(new InputStreamReader(this.getInputStream()));
+    }
+
+    public String getBody() {
+        return this.body;
+    }
+}
+

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

@@ -0,0 +1,82 @@
+package com.steerinfo.dil.config;
+
+import com.alibaba.fastjson.JSONObject;
+import com.steerinfo.dil.annotaion.LogAround;
+import com.steerinfo.dil.annotaion.RequestLimit;
+import com.steerinfo.framework.controller.RESTfulResult;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import org.springframework.web.method.HandlerMethod;
+import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
+import springfox.documentation.spring.web.json.Json;
+
+import javax.servlet.ReadListener;
+import javax.servlet.ServletInputStream;
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletRequestWrapper;
+import javax.servlet.http.HttpServletResponse;
+import java.io.*;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Web拦截器，拦截请求并校验
+ */
+@Slf4j
+@Component
+public class SessionInterceptor extends HandlerInterceptorAdapter {
+
+    //暂时使用Map当做Redis缓存
+    private static Map<String,Integer> redisUtil = new HashMap<>();
+
+    @Override
+    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
+        HandlerMethod hm = (HandlerMethod) handler;
+        if(request.getAttribute("userId")==null || request.getAttribute("userName")==null){
+            //无权访问
+            response.setCharacterEncoding("UTF-8");
+            response.setContentType("application/json; charset=utf-8");
+            RESTfulResult result =new RESTfulResult("500", "无权访问", "无权访问");
+            response.getWriter().write(JSONObject.toJSONString(result));
+            return false;
+        }
+        //获取方法中的注解,看是否有该注解
+        RequestLimit requestLimit = hm.getMethodAnnotation(RequestLimit.class);
+        if(requestLimit != null){
+            try{
+                String userId = "" + request.getAttribute("userId");
+                String userName = "" + request.getAttribute("userName");
+                int seconds = requestLimit.seconds();
+                int maxCount = requestLimit.maxCount();
+                String methodName = hm.getMethod().getName();
+                //获取请求体
+                BufferedReader streamReader = new BufferedReader( new InputStreamReader(request.getInputStream(), "UTF-8"));
+                StringBuilder strBuilder = new StringBuilder();
+                String inputStr;
+                while ((inputStr = streamReader.readLine()) != null) {
+                    strBuilder.append(inputStr);
+                }
+                Integer count = redisUtil.get(methodName+userId);
+                if(count ==null || count < maxCount){
+                    //未超出，+1
+                    count = (count == null ?  0 : count+1);
+                    redisUtil.put( methodName+userId, count);
+                }else{
+                    //超出访问次数
+                    log.info("访问"+methodName+"方法过快，用户  ===> " + userId + " 且在   " + seconds + " 秒内超过最大限制  ===> " + maxCount + " 次数达到    ====> " + count);
+                    response.setCharacterEncoding("UTF-8");
+                    response.setContentType("application/json; charset=utf-8");
+                    RESTfulResult result =new RESTfulResult("500", "访问过快，请稍后再试", "访问过快，请稍后再试");
+                    response.getWriter().write(JSONObject.toJSONString(result));
+                    return false;
+                }
+            }catch (Exception e){
+                e.printStackTrace();
+            }
+        }
+        return super.preHandle(request, response, handler);
+    }
+
+}

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

@@ -0,0 +1,21 @@
+package com.steerinfo.dil.config;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+
+/**
+ * web配置，可以配置拦截器等
+ */
+@Configuration
+public class WebConfig extends WebMvcConfigurerAdapter {
+
+    @Autowired
+    private SessionInterceptor interceptor;
+
+    @Override
+    public void addInterceptors(InterceptorRegistry registry) {
+        registry.addInterceptor(interceptor);
+    }
+}

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

@@ -1,5 +1,9 @@
 package com.steerinfo.dil.controller;
+import com.steerinfo.dil.annotaion.LogAround;
+import com.steerinfo.dil.annotaion.RequestLimit;
 import com.steerinfo.dil.feign.RmsFeign;
+import com.steerinfo.dil.util.BaseRESTfulController;
+import com.steerinfo.framework.controller.BaseController;
 import com.steerinfo.framework.controller.RESTfulResult;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -13,7 +17,7 @@ import java.util.HashMap;
 import java.util.Map;
 @RestController
 @RequestMapping("${api.version}/rms")
-public class RMScontroller {
+public class RMScontroller extends BaseRESTfulController {
     @Autowired
     RmsFeign rmsFeign;
 
@@ -57,17 +61,6 @@ public class RMScontroller {
         return rmsFeign.getAllLineDesk(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId, lineType, con);
     }
 
-    @ApiOperation(value="查询线路中的门岗汽车衡", notes="分页查询")
-    @PostMapping("/deleteMaterialForInward")
-    public Map<String, Object> deleteMaterialForInward(@RequestBody(required = false) Map<String,Object> mapValue){
-        return rmsFeign.deleteMaterialForInward(mapValue);
-    }
-
-    @ApiOperation(value="查询线路中的门岗汽车衡", notes="分页查询")
-    @PostMapping("/updateMaterialForInward")
-    public Map<String, Object> updateMaterialForInward(@RequestBody(required = false) Map<String,Object> mapValue){
-        return rmsFeign.updateMaterialForInward(mapValue);
-    }
 
     @ApiOperation(value="删除数据为了内转")
     @PostMapping("/getGateCalculateMes")
@@ -106,136 +99,46 @@ public class RMScontroller {
         return rmsFeign.LinkInsertSelective(mapValue);
     }
 
-    //********************************************************************************************************
-
-    @ApiOperation(value="创建", notes="根据RmsCarDriver对象创建")
-    @ApiImplicitParam(name = "rmsCarDriver", value = "详细实体rmsCarDriver", required = true, dataType = "RmsCarDriver")
-    @PostMapping(value = "/insertCarDriver")
-    public Map<String, Object> insertCarDriver(@RequestBody(required = false) Map<String, Object> map){
-        return rmsFeign.insertCarDriver(map);
-    }
-
-    @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象，并根据传过来的rmsCarDriver信息来更新详细信息")
-    @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal"),
-            @ApiImplicitParam(name = "rmsCarDriver", value = "详细实体rmsCarDriver", required = true, dataType = "RmsCarDriver")
-    })
-    @PostMapping(value = "/updateCarDriver", produces  = "application/json;charset=UTF-8")
-    public Map<String, Object> updateCarDriver(@RequestBody Map<String, Object> map){
-        return rmsFeign.updateCarDriver(map);
-    }
-
-    @ApiOperation(value="删除司机信息", notes="根据url的id来指定更新对象，并根据传过来的rmsCarDriver信息删除司机信息")
-    @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal"),
-            @ApiImplicitParam(name = "rmsCarDriver", value = "详细实体rmsCarDriver", required = true, dataType = "RmsCarDriver")
-    })
-    @PostMapping(value = "/deleteCarDriver/{id}")
-    Map<String, Object> deleteCarDriver(@PathVariable("id") BigDecimal id) {
-        return rmsFeign.deleteCarDriver(id);
-    }
-
-    @ApiOperation(value="获取司机详细信息", notes="根据url的id来获取详细信息")
-    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal")
-    @PostMapping(value = "/getCarDriverById/{id}")
-    public Map<String, Object> getCarDriverById(@PathVariable("id") BigDecimal id){
-        return rmsFeign.getCarDriverById(id);
-    }
-    @PostMapping("/getCarDriverList")
-    @ApiOperation(value = "模糊查询司机")
-    public Map<String, Object> getCarDriverList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                                Integer pageNum,
-                                                Integer pageSize,
-                                                Integer apiId,
-                                                String con) {
+    //物资类型
+    @PostMapping("/getMaterialTypeList")
+    @ApiOperation(value = "查询物资种类列表")
+    public Map<String, Object> getMaterialTypeList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                   Integer pageNum,
+                                                   Integer pageSize,
+                                                   Integer apiId,
+                                                   String con) {
 
-        return rmsFeign.getCarDriverList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
+        return rmsFeign.getMaterialTypeList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
     }
-
-    //获取承运商列表
-    @ApiOperation(value="获取承运商列表")
-    @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("/getCarrierList")
-    public Map<String, Object> getCarrierList(@RequestBody(required=false) Map<String,Object> mapValue,
-                                              Integer apiId,
-                                              Integer pageNum,
-                                              Integer pageSize,
-                                              String con
-    ){
-        if (mapValue==null){
-            mapValue=new HashMap<>();
-        }
-        return   rmsFeign.getCarrierList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize,con);
+    @ApiOperation("新增物资类型")
+    @PostMapping("/insertMaterialType")
+    @LogAround(foreignKeys = {"materialTypeId"},foreignKeyTypes = "物资类型",description = "新增物资类型")
+    public RESTfulResult insertMaterialType(@RequestBody(required = false) Map<String,Object> map) {
+        return rmsFeign.insertMaterialType(map);
     }
-    @ApiOperation(value="新建承运商", notes="根据rmsCarrier对象创建")
-    @ApiImplicitParam(name = "rmsCarrier", value = "详细实体rmsCarrier", required = true, dataType = "rmsCarrier")
-    @PostMapping(value = "/insertCarrier")
-    public Map<String, Object> insertCarrier(@RequestBody(required = false) Map<String, Object> map){
-        return rmsFeign.insertCarrier(map);
+    @ApiOperation(value="删除物资类型")
+    @ApiImplicitParam(name = "rmsMaterialType", value = "rmsMaterialType", required = true, dataType = "rmsMaterialType")
+    @PostMapping(value = "/deleteMaterialType")
+    @LogAround(foreignKeys = {"materialTypeId"},foreignKeyTypes = "物资类型",description = "删除物资类型")
+    public RESTfulResult deleteMaterialType(@RequestBody(required = false) Map<String,Object> map){
+        return rmsFeign.deleteMaterialType(map);
     }
-    @ApiOperation(value="删除", notes="根据rmsCarrier对象创建")
-    @ApiImplicitParam(name = "rmsCarrier", value = "详细实体rmsCarrier", required = true, dataType = "rmsCarrier")
-    @PostMapping(value = "/deleteCarrier/{id}")
-    public Map<String, Object> deleteCarrier(@PathVariable("id")BigDecimal id){
-        return rmsFeign.deleteCarrier(id);
-    }
-
-    @ApiOperation(value="更新承运商", notes="根据rmsCarrier对象创建")
-    @ApiImplicitParam(name = "rmsCarrier", value = "详细实体rmsCarrier", required = true, dataType = "rmsCarrier")
-    @PostMapping(value = "/updateCarrier")
-    public Map<String, Object> updateCarrier(@RequestBody(required = false) Map<String, Object> map){
-        return rmsFeign.updateCarrier(map);
-    }
-    @ApiOperation(value="根据id查询详细承运商信息", notes="根据rmsCarrier对象创建")
-    @ApiImplicitParam(name = "rmsCarrier", value = "详细实体rmsCarrier", required = true, dataType = "rmsCarrier")
-    @PostMapping(value = "/getCarrierById/{id}")
-    public Map<String, Object> getCarrierById(@PathVariable("id")BigDecimal id){
-        return rmsFeign.getCarrierById(id);
-    }
-//    获取中标区域
-    @ApiOperation(value="展示中标区域信息")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "apiId", value = "406", required = false, dataType = "BigDecimal"),
-            @ApiImplicitParam(name = "id", value = "中标id", required = false, dataType = "BigDecimal"),
-    })
-    @PostMapping("/getCarrierBidAreaList")
-    public Map<String, Object> getCarrierBidAreaList(@RequestBody(required=false) Map<String,Object> mapValue,
-                                               Integer apiId,
-                                               Integer pageNum,
-                                               Integer pageSize,
-                                               String con
-    ){
-        return   rmsFeign.getCarrierBidAreaList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize,con);
+    @ApiOperation(value="更新物资类型")
+    @ApiImplicitParam(name = "rmsMaterialType", value = "rmsMaterialType", required = true, dataType = "rmsMaterialType")
+    @PostMapping(value = "/updateMaterialType")
+    @LogAround(foreignKeys = {"materialTypeId"},foreignKeyTypes = "物资类型",description = "修改物资类型")
+    public Map<String, Object> updateMaterialType(@RequestBody(required = false) Map<String, Object> map){
+        return rmsFeign.updateMaterialType(map);
     }
-    //    处理承运商照片
-    @PostMapping(value = "/uploadCarrier1")
-    public String uploadCarrier1(@RequestParam ("file") MultipartFile multipartFile){
-        return rmsFeign.uploadCarrier1(multipartFile);
+    @ApiOperation(value="根据id查询物资类型信息", notes="")
+    @ApiImplicitParam(name = "rmsMaterialType", value = "rmsMaterialType", required = true, dataType = "rmsMaterialType")
+    @PostMapping(value = "/getMaterialTypeById/{id}")
+    public Map<String, Object> getMaterialTypeById(@PathVariable("id") BigDecimal id){
+        return rmsFeign.getMaterialTypeById(id);
     }
 
 
-
-
-    //    处理承运商照片
-    @PostMapping("/uploadCarrier2")
-    public int uploadCarrier2(@RequestParam("file") MultipartFile multipartFile){
-        return rmsFeign.uploadCarrier2(multipartFile);
-    }
-    //    处理承运商照片
-    @PostMapping("/uploadCarrier3")
-    public int uploadCarrier3(@RequestParam("file") MultipartFile multipartFile){
-        return rmsFeign.uploadCarrier3(multipartFile);
-    }
-    //获取物资列表
+    //物资
     @ApiOperation(value="获取物资列表")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
@@ -253,25 +156,25 @@ public class RMScontroller {
     ){
         return   rmsFeign.getMaterialList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize,con);
     }
-
-
-
     @ApiOperation(value="新增物资", notes="根据rmsMaterial对象创建")
     @ApiImplicitParam(name = "rmsMaterial", value = "详细实体rmsMaterial", required = true, dataType = "rmsMaterial")
     @PostMapping(value = "/insertMaterial")
+    @LogAround(foreignKeys = {"materialId"},foreignKeyTypes = {"物资"},description = "新增物资")
     public Map<String, Object> insertMaterial(@RequestBody(required = false) Map<String, Object> map){
         return rmsFeign.insertMaterial(map);
     }
     @ApiOperation(value="删除", notes="根据rmsCarrier对象创建")
     @ApiImplicitParam(name = "rmsMaterial", value = "详细实体rmsMaterial", required = true, dataType = "rmsMaterial")
-    @PostMapping(value = "/deleteMaterial/{id}")
-    public Map<String, Object> deleteMaterial(@PathVariable("id")BigDecimal id){
-        return rmsFeign.deleteMaterial(id);
+    @PostMapping(value = "/deleteMaterial")
+    @LogAround(foreignKeys = {"materialId"},foreignKeyTypes = {"物资"},description = "删除物资")
+    public Map<String, Object> deleteMaterial(@RequestBody(required = false) Map<String, Object> map){
+        return rmsFeign.deleteMaterial(map);
     }
 
     @ApiOperation(value="更新物资", notes="根据rmsMaterial对象创建")
     @ApiImplicitParam(name = "rmsMaterial", value = "详细实体rmsMaterial", required = true, dataType = "rmsMaterial")
     @PostMapping(value = "/updateMaterial")
+    @LogAround(foreignKeys = {"materialId"},foreignKeyTypes = {"物资"},description = "修改物资")
     public Map<String, Object> updateMaterial(@RequestBody(required = false) Map<String, Object> map){
         return rmsFeign.updateMaterial(map);
     }
@@ -282,6 +185,7 @@ public class RMScontroller {
         return rmsFeign.getMaterialById(id);
     }
 
+    //============人员信息
     @ApiOperation(value="获取人员信息列表")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
@@ -327,54 +231,10 @@ public class RMScontroller {
         return rmsFeign.getPersonnelById(personnelId);
     }
 
-    @ApiOperation(value="获取托运人列表")
-
-    @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("/getShipperList")
-    public Map<String, Object> getShipperList(@RequestBody(required=false) Map<String,Object> mapValue,
-                                              Integer apiId,
-                                              Integer pageNum,
-                                              Integer pageSize,
-                                              String con
-    ){
-        return   rmsFeign.getShipperList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize,con);
-    }
-
-    @ApiOperation(value="新增托运人信息", notes="根据rmsShipper对象创建")
-    @ApiImplicitParam(name = "rmsShipper", value = "详细实体rmsShipper", required = true, dataType = "rmsShipper")
-    @PostMapping(value = "/insertShipper")
-    public Map<String, Object> insertShipper(@RequestBody(required = false) Map<String, Object> map){
-        return rmsFeign.insertShipper(map);
-    }
 
 
-    @ApiImplicitParam(name = "托运人id", value = "id", required = true, dataType = "int")
-    @PostMapping(value = "/deleteShipper/{id}")
-    public Map<String, Object> deleteShipper(@PathVariable("id")BigDecimal id){
-        return rmsFeign.deleteShipper(id);
-    }
-
-    @ApiOperation(value="更新托运人信息", notes="根据rmsShipper对象创建")
-    @ApiImplicitParam(name = "rmsShipper", value = "详细实体rmsShipper", required = true, dataType = "rmsShipper")
-    @PostMapping(value = "/updateShipper")
-    public Map<String, Object> updateShipper(@RequestBody(required = false) Map<String, Object> map){
-        return rmsFeign.updateShipper(map);
-    }
-    @ApiOperation(value="根据id查询详细托运人信息", notes="根据rmsShipper对象创建")
-    @ApiImplicitParam(name = "托运人id", value = "id", required = true, dataType = "int")
-    @PostMapping(value = "/getShipperById/{id}")
-    public Map<String, Object> getShipperById(@PathVariable("id")BigDecimal id){
-        return rmsFeign.getShipperById(id);
-    }
-//    获取供应商列表
 
+    //================公司
     @ApiOperation(value="展示供应商信息")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
@@ -383,43 +243,41 @@ public class RMScontroller {
             @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
     })
-
-    @PostMapping("/getSupplierList")
-    public Map<String, Object> getSupplierList(@RequestBody(required=false) Map<String,Object> mapValue,
+    @PostMapping("/getCompanyList")
+    public Map<String, Object> getCompanyList(@RequestBody(required=false) Map<String,Object> mapValue,
                                                Integer apiId,
                                                Integer pageNum,
-                                               Integer pageSize,
-                                               String con
+                                               Integer pageSize
     ){
-        return   rmsFeign.getSupplierList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize,con);
+        return   rmsFeign.getCompanyList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
     }
-    @ApiOperation(value="新增供应商信息", notes="根据rmsSupplier对象创建")
-    @ApiImplicitParam(name = "rmsSupplier", value = "详细实体rmsSupplier", required = true, dataType = "rmsSupplier")
-    @PostMapping(value = "/insertSupplier")
-    public Map<String, Object> insertSupplier(@RequestBody(required = false) Map<String, Object> map){
-        return rmsFeign.insertSupplier(map);
+    @ApiOperation(value="新增供应商信息", notes="根据rmsCompany对象创建")
+    @ApiImplicitParam(name = "rmsCompany", value = "详细实体rmsCompany", required = true, dataType = "rmsCompany")
+    @PostMapping(value = "/insertCompany")
+    public Map<String, Object> insertCompany(@RequestBody(required = false) Map<String, Object> map){
+        return rmsFeign.insertCompany(map);
     }
-    @ApiOperation(value="删除", notes="根据rmsSupplier对象创建")
+    @ApiOperation(value="删除", notes="根据rmsCompany对象创建")
     @ApiImplicitParam(name = "承运商id", value = "id", required = true, dataType = "int")
-    @PostMapping(value = "/deleteSupplier/{id}")
-    public Map<String, Object> deleteSupplier(@PathVariable("id")BigDecimal id){
-        return rmsFeign.deleteSupplier(id);
+    @PostMapping(value = "/deleteCompany")
+    public Map<String, Object> deleteCompany(@RequestBody Map<String,Object> map){
+        return rmsFeign.deleteCompany(map);
     }
 
-    @ApiOperation(value="更新供应商信息", notes="根据rmsSupplier对象创建")
-    @ApiImplicitParam(name = "rmsSupplier", value = "详细实体rmsSupplier", required = true, dataType = "rmsSupplier")
-    @PostMapping(value = "/updateSupplier")
-    public Map<String, Object> updateSupplier(@RequestBody(required = false) Map<String, Object> map){
-        return rmsFeign.updateSupplier(map);
+    @ApiOperation(value="更新供应商信息", notes="根据rmsCompany对象创建")
+    @ApiImplicitParam(name = "rmsCompany", value = "详细实体rmsCompany", required = true, dataType = "rmsCompany")
+    @PostMapping(value = "/updateCompany")
+    public Map<String, Object> updateCompany(@RequestBody(required = false) Map<String, Object> map){
+        return rmsFeign.updateCompany(map);
     }
-    @ApiOperation(value="根据id查询供应商信息", notes="根据rmsSupplier对象创建")
+    @ApiOperation(value="根据id查询供应商信息", notes="根据rmsCompany对象创建")
     @ApiImplicitParam(name = "承运商id", value = "id", required = true, dataType = "int")
-    @PostMapping(value = "/getSupplierById/{id}")
-    public Map<String, Object> getSupplierById(@PathVariable("id")BigDecimal id){
-        return rmsFeign.getSupplierById(id);
+    @PostMapping(value = "/getCompanyById/{id}")
+    public Map<String, Object> getCompanyById(@PathVariable("id")BigDecimal id){
+        return rmsFeign.getCompanyById(id);
     }
-//    展示运力信息
 
+    //运力
     @ApiOperation(value="新增运力信息", notes="根据rmsCapacity对象创建")
     @ApiImplicitParam(name = "rmsCapacity", value = "详细实体rmsCapacity", required = true, dataType = "rmsCapacity")
     @PostMapping(value = "/insertCapacity")
@@ -461,66 +319,7 @@ public class RMScontroller {
         return rmsFeign.getCapacityList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con,carrierSSOId);
     }
 
-    @ApiOperation(value="新增汽车衡信息", notes="根据rmsCapacity对象创建")
-    @ApiImplicitParam(name = "rmsTruckCalculate", value = "详细实体rmsTruckCalculate", required = true, dataType = "rmsTruckCalculate")
-    @PostMapping(value = "/insertTruckCalculate")
-    public Map<String, Object> insertTruckCalculate(@RequestBody(required = false) Map<String, Object> map){
-        return rmsFeign.insertTruckCalculate(map);
-    }
-    @ApiOperation(value="删除", notes="根据rmsCarrier对象创建")
-    @ApiImplicitParam(name = "汽车衡id", value = "id", required = true, dataType = "int")
-    @PostMapping(value = "/deleteTruckCalculate/{id}")
-    public Map<String, Object> deleteTruckCalculate(@PathVariable("id")BigDecimal id){
-        return rmsFeign.deleteTruckCalculate(id);
-    }
-    @ApiOperation(value="删除", notes="根据rmsCarrier对象创建")
-    @ApiImplicitParam(name = "汽车衡物资中间表id", value = "id", required = true, dataType = "int")
-    @PostMapping(value = "/deleteTruckCalculateMaterial/{id}")
-    public Map<String, Object> deleteTruckCalculateMaterial(@PathVariable("id")BigDecimal id){
-        return rmsFeign.deleteTruckCalculateMaterial(id);
-    }
-    @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象，并根据传过来的rmsCarDriver信息来更新详细信息")
-    @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal"),
-            @ApiImplicitParam(name = "rmsTruckCalculate", value = "详细实体rmsTruckCalculate", required = true, dataType = "RmsTruckCalculate")
-    })
-    @PostMapping(value = "/updateTruckCalculate", produces  = "application/json;charset=UTF-8")
-    public Map<String, Object> updateTruckCalculate(@RequestBody Map<String, Object> map){
-        return rmsFeign.updateTruckCalculate(map);
-    }
-
-    @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
-    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal")
-    @PostMapping(value = "/getTruckCalculateById/{id}")
-    public Map<String,Object> getTruckCalculateById(@PathVariable("id") BigDecimal id){
-        return rmsFeign.getTruckCalculateById(id);
-    }
-    @PostMapping("/getCalculateOfMaterialList")
-    @ApiOperation(value="根据id查询汽车横下的物资表")
-    public Map<String,Object> getCalculateOfMaterialList(@RequestBody(required = false)Map<String, Object> mapValue,
-                                                         Integer pageNum,
-                                                         Integer pageSize,
-                                                         Integer apiId,
-                                                         BigDecimal truckCalculateId){
-        return rmsFeign.getCalculateOfMaterialList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,truckCalculateId);
-    }
-
-    @PostMapping("/getTruckCalculateList")
-    @ApiOperation(value = "模糊查询汽车衡")
-    public Map<String, Object> getTruckCalculateList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                                     Integer pageNum,
-                                                     Integer pageSize,
-                                                     Integer apiId,
-                                                     String con) {
 
-        return rmsFeign.getTruckCalculateList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
-    }
-    @ApiOperation(value="新增汽车衡下的物资", notes="根据rmsWarehouse对象创建")
-    @ApiImplicitParam(name = "rmsTruckCalculateMaterial", value = "详细实体rmsTruckCalculateMaterial", required = true, dataType = "rmsTruckCalculateMaterial")
-    @PostMapping(value = "/insertTruckCalculateOfMaterial")
-    public Map<String, Object> insertTruckCalculateOfMaterial(@RequestBody(required = false) Map<String, Object> map){
-        return rmsFeign.insertTruckCalculateOfMaterial(map);
-    }
     @ApiOperation(value="删除", notes="根据rmsCarrier对象创建")
     @ApiImplicitParam(name = "仓库id", value = "id", required = true, dataType = "int")
     @PostMapping(value = "/deleteWarehouse/{id}")
@@ -671,16 +470,7 @@ public class RMScontroller {
         return rmsFeign.getGatepostName(gatepostId);
     }
 
-    @PostMapping("/getMaterialTypeList")
-    @ApiOperation(value = "框计算物资种类")
-    public Map<String, Object> getMaterialTypeList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                                   Integer pageNum,
-                                                   Integer pageSize,
-                                                   Integer apiId,
-                                                   String con) {
 
-        return rmsFeign.getMaterialTypeList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
-    }
     //*******************************下拉框************************
     @GetMapping("getCapacityTypeId")
     @ApiOperation(value = "得到下拉运力id")
@@ -785,50 +575,6 @@ public class RMScontroller {
     }
 
 
-    //港口
-    @ApiOperation(value = "获取港口", notes = "分页查询")
-    @PostMapping(value = "/getPort")
-    public Map<String, Object> getPortList(@RequestBody(required = false) Map<String, Object> mapVal,
-                                             Integer apiId,
-                                             Integer pageNum,
-                                             Integer pageSize,
-                                             String con
-    ) {
-        if (mapVal == null) {
-            mapVal = new HashMap<>();
-        }
-        return rmsFeign.getPortList(mapVal == null ? new HashMap<>() : mapVal, apiId, pageNum, pageSize, con);
-    }
-
-    //码头
-    @ApiOperation(value = "获取码头", notes = "分页查询")
-    @PostMapping(value = "/getPier")
-    public Map<String, Object> getPierList(@RequestBody(required = false) Map<String, Object> mapVal,
-                                           Integer apiId,
-                                           Integer pageNum,
-                                           Integer pageSize,
-                                           String con
-    ) {
-        if (mapVal == null) {
-            mapVal = new HashMap<>();
-        }
-        return rmsFeign.getPierList(mapVal == null ? new HashMap<>() : mapVal, apiId, pageNum, pageSize, con);
-    }
-
-    @ApiOperation(value = "获取港存堆场", notes = "分页查询")
-    @PostMapping(value = "/getYardList")
-    public Map<String, Object> getPortYardList(@RequestBody(required = false) Map<String, Object> mapVal,
-                                           Integer apiId,
-                                           Integer pageNum,
-                                           Integer pageSize,
-                                           String con
-    ) {
-        if (mapVal == null) {
-            mapVal = new HashMap<>();
-        }
-        return rmsFeign.getPortYardList(mapVal == null ? new HashMap<>() : mapVal, apiId, pageNum, pageSize, con);
-    }
-
 
     @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
     @ApiImplicitParam(paramType = "path", name = "公告id", value = "ID", required = true, dataType = "BigDecimal")
@@ -889,151 +635,6 @@ public class RMScontroller {
     }
 
 
-
-
-
-//*******************************下拉框************************
-
-    @GetMapping("getNoticeTypeId")
-    @ApiOperation(value = "得到公告类型Id")
-    public Map<String,Object> getNoticeTypeId(){
-        return rmsFeign.getNoticeTypeId();
-    }
-
-
-
-    @GetMapping("getPortType")
-    @ApiOperation(value = "得到港口类型Id")
-    public Map<String,Object> getPortType(){
-        return rmsFeign.getPortType();
-    }
-
-    @ApiOperation(value="新增原料仓库信息", notes="根据rmsWarehouse对象创建")
-    @ApiImplicitParam(name = "rmsWarehouse", value = "详细实体rmsWarehouse", required = true, dataType = "rmsWarehouse")
-    @PostMapping(value = "/insertWarehouse")
-    public Map<String, Object> insertWarehouse(@RequestBody(required = false) Map<String, Object> map) {
-        return rmsFeign.insertWarehouse(map);
-    }
-
-
-
-    //展示收货客户信息
-    @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 = "/getConsigneeList")
-    public Map<String, Object> getConsigneeList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                                     Integer apiId,
-                                                     Integer pageNum,
-                                                     Integer pageSize,
-                                                     String con
-    ) {
-
-        return rmsFeign.getConsigneeList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, con);
-    }
-
-    @ApiOperation(value="新增收货客户信息", notes="根据rmsConsignee对象创建")
-    @ApiImplicitParam(name = "rmsConsignee", value = "详细实体rmsConsignee", required = true, dataType = "rmsConsignee")
-    @PostMapping(value = "/insertConsignee")
-    public Map<String, Object> insertConsignee(@RequestBody(required = false) Map<String, Object> map){
-        return rmsFeign.insertConsignee(map);
-    }
-    @ApiOperation(value="删除", notes="根据rmsConsignee对象创建")
-    @ApiImplicitParam(name = "收货客户信息id", value = "id", required = true, dataType = "int")
-    @PostMapping(value = "/deleteConsignee/{id}")
-    public Map<String, Object> deleteConsignee(@PathVariable("id")BigDecimal id){
-        return rmsFeign.deleteConsignee(id);
-    }
-
-    @ApiOperation(value="获取运力信息", notes="根据url的id来获取详细信息")
-    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal")
-    @PostMapping(value = "/getConsigneeById/{id}")
-    public Map<String,Object> getConsigneeById(@PathVariable("id")BigDecimal id){
-        return rmsFeign.getConsigneeById(id);
-    }
-    @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象，并根据传过来的rmsCapacity信息来更新详细信息")
-    @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "Short"),
-            @ApiImplicitParam(name = "rmsConsignee", value = "详细实体rmsConsignee", required = true, dataType = "RmsConsignee")
-    })
-    @PostMapping(value = "/updateConsignee", produces  = "application/json;charset=UTF-8")
-    public Map<String, Object> updateConsignee( @RequestBody Map<String, Object> map){
-
-        return rmsFeign.updateConsignee(map);
-    }
-
-    /*
-     *边写边搜索承运商
-     * */
-    @ApiOperation(value="根据用户输入输出承运商", notes="模糊查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "con",value = "用户输入的承运商名", required = false, dataType = "String")
-    })
-    @PostMapping("/getCarrierName")
-    public Map<String,Object> getCarrierName(@RequestParam(value ="state") String state){
-        return  rmsFeign.getCarrierName(state);
-
-    }
-
-
-
-    //港口
-    @PostMapping("/insertPort")
-    public Map<String, Object> insertPort(@RequestBody(required = false) Map<String, Object> map) {
-        return rmsFeign.insertPort(map);
-    }
-
-    //
-    @PostMapping("/insertPier")
-    public Map<String, Object> insertPier(@RequestBody(required = false) Map<String, Object> map) {
-        return rmsFeign.insertPier(map);
-    }
-
-    //港口
-    @PostMapping("/insertPortYard")
-    public Map<String, Object> insertPortYard(@RequestBody(required = false) Map<String, Object> map) {
-        return rmsFeign.insertPortYard(map);
-    }
-
-    @PostMapping(value = "/deletePort/{portId}")//BigDecimal
-    public Map<String, Object> deletePort(@PathVariable("portId") BigDecimal portId) {
-        return rmsFeign.deletePort(portId);
-    }
-
-    @PostMapping(value = "/deletePier/{pierId}")//BigDecimal
-    public Map<String, Object> deletePier(@PathVariable("pierId") BigDecimal pierId) {
-        return rmsFeign.deletePier(pierId);
-    }
-
-    @PostMapping(value = "/deletePortYard/{warehouseId}")//BigDecimal
-    public Map<String, Object> deletePortYard(@PathVariable("warehouseId") BigDecimal warehouseId) {
-        return rmsFeign.deletePortYard(warehouseId);
-    }
-
-
-    /**
-     * 得到二级部门的下拉
-     * @return
-     */
-    @GetMapping("/getSecondShipper")
-    public Map<String,Object> getSecondShipper() {
-        return  rmsFeign.getSecondShipper();
-    }
-
-    /**
-     * 得到三级部门的下拉
-     * @return
-     */
-    @GetMapping("/getThirdShipper")
-    public Map<String,Object> getThirdShipper(@RequestParam Integer shipperId) {
-        return  rmsFeign.getThirdShipper(shipperId);
-    }
-
     /**
      * 新增人员权限
      * @return
@@ -1130,12 +731,6 @@ public class RMScontroller {
         return rmsFeign.getInwardContractMaterial(map!=null?map:new HashMap<>(),apiId,pageNum,pageSize,con);
     }
 
-    @ApiOperation("罗棒的")
-    @PostMapping("/insertMaterialType")
-    public RESTfulResult insertMaterialType(@RequestBody(required = false) Map<String,Object> map) {
-        return rmsFeign.insertMaterialType(map);
-    }
-
     @ApiOperation("渲染运力修改数据")
     @PostMapping("/getCapacityInfoById/{id}")
     public Map<String, Object> getCapacityInfoById(@PathVariable("id") Integer id){
@@ -1183,67 +778,8 @@ public class RMScontroller {
         return rmsFeign.signConsignee(mapVal);
     }
 
-    //边输边查港口名称
-    @PostMapping(value = "/getPortName")
-    public Map<String, Object> getPortName(String index){
-        return rmsFeign.getPortName(index);
-    }
-
-    //边输边查码头名称
-    @PostMapping(value = "/getPierName")
-    public Map<String, Object> getPierName(String index){
-        return rmsFeign.getPierName(index);
-    }
-
-
-    @ApiOperation(value="获取船运合同管理列表")
-    @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("/selectbmsshipContractPriceList")
-    public Map<String, Object> selectbmsshipContractPriceList(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                              Integer apiId,
-                                                              Integer pageNum,
-                                                              Integer pageSize,
-                                                              String con,
-                                                              String startTime,
-                                                              String endTime
-    ){
-        if (mapValue==null){
-            mapValue=new HashMap<>();
-        }
-        return   rmsFeign.selectbmsshipContractPriceList(mapValue, apiId, pageNum, pageSize, con, startTime, endTime);
-    }
-
-
-    //新增船运合同管理
-    @PostMapping(value = "/insertBmsshipContractPrice")
-    public Map<String, Object> insertBmsshipContractPrice(@RequestBody(required = false) Map<String,Object> map){
-        return rmsFeign.insertBmsshipContractPrice(map);
-    }
-
-    //修改船运合同管理
-    @PostMapping(value = "/updateBmsshipContractPrice")
-    public Map<String, Object> updateBmsshipContractPrice(@RequestBody(required = false) Map<String,Object> map){
-        return rmsFeign.updateBmsshipContractPrice(map);
-    }
 
-    //修改船运合同管理
-    @PostMapping(value = "/deleteBmsshipContractPrice")
-    public Map<String, Object> deleteBmsshipContractPrice(@RequestBody(required = false) Map<String,Object> map){
-        return rmsFeign.deleteBmsshipContractPrice(map);
-    }
 
-    //修改船运合同管理
-    @PostMapping(value = "/selectBmsshipPriceList/{id}")
-    public Map<String, Object> selectBmsshipPriceList(@PathVariable("id") BigDecimal id){
-        return rmsFeign.selectBmsshipPriceList(id);
-    }
 
     @ApiOperation(value = "查询运力类型")
     @PostMapping("/getCapacityType")
@@ -1289,54 +825,10 @@ public class RMScontroller {
         return rmsFeign.insertTransRange(map);
     }
 
-    @ApiOperation(value = "查询APP备注")
-    @PostMapping("/getMaterialCoke")
-    public Map<String, Object> getMaterialCoke(@RequestBody(required = false) Map<String,Object> map,
-                                             Integer apiId,
-                                             Integer pageNum,
-                                             Integer pageSize,
-                                             String con) {
-        if(map==null){
-            map=new HashMap<>();
-        }
-        return rmsFeign.getMaterialCoke(map,apiId,pageNum,pageSize,con);
-    }
-
-    @ApiOperation(value="新增APP备注")
-    @PostMapping(value = "/insertMaterialCoke")
-    public Map<String, Object> insertMaterialCoke(@RequestBody(required = false) Map<String, Object> map){
-        return rmsFeign.insertMaterialCoke(map);
+    @PostMapping(value = "/test")
+    @LogAround(foreignKeys = {"orderId"},foreignKeyTypes = {"运输订单"},description = "测试日志功能")
+    public RESTfulResult test(@RequestBody(required = false) Map<String, Object> map){
+        return success(map,"测试成功！");
     }
 
-    @ApiOperation(value="删除APP备注")
-    @PostMapping(value = "/deleteMaterialCoke/{id}")
-    public Map<String, Object> deleteMaterialCoke(@PathVariable("id")BigDecimal id){
-        return rmsFeign.deleteMaterialCoke(id);
-    }
-
-
-    @ApiOperation(value = "查询收款客户")
-    @PostMapping("/getReceiveCompany")
-    public Map<String, Object> getReceiveCompany(@RequestBody(required = false) Map<String,Object> map,
-                                               Integer apiId,
-                                               Integer pageNum,
-                                               Integer pageSize,
-                                               String con) {
-        if(map==null){
-            map=new HashMap<>();
-        }
-        return rmsFeign.getReceiveCompany(map,apiId,pageNum,pageSize,con);
-    }
-
-    @ApiOperation(value="新增收款客户")
-    @PostMapping(value = "/insertReceiveCompany")
-    public Map<String, Object> insertReceiveCompany(@RequestBody(required = false) Map<String, Object> map){
-        return rmsFeign.insertReceiveCompany(map);
-    }
-
-    @ApiOperation(value="删除收款客户")
-    @PostMapping(value = "/deleteReceiveCompany/{id}")
-    public Map<String, Object> deleteReceiveCompany(@PathVariable("id")BigDecimal id){
-        return rmsFeign.deleteReceiveCompany(id);
-    }
 }

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

@@ -53,6 +53,13 @@ public class UniversalController extends BaseRESTfulController {
     @Autowired
     private ImageFileUtils imageFileUtils;
 
+    @ApiModelProperty(value = "边输边查公司单位")
+    @PostMapping("/getCompanyMesByLike")
+    public RESTfulResult getSupplierMesByLike(@RequestParam("index") String index) {
+        List<Map<String, Object>> list = universalMapper.getCompanyMesByLike(index == null ? "" : index);
+        return success(list);
+    }
+
 
 
     @ApiOperation("获取图片通用方法")

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

@@ -93,127 +93,86 @@ public interface RmsFeign {
                                          @RequestParam("apiId") Integer apiId,
                                          @RequestParam("con") String con);
 
-
-    //获取承运商列表
-    @PostMapping(value = "api/v1/rms/rmscarrier/getCarrierList")
-    Map<String,Object>     getCarrierList(@RequestBody(required = false) Map<String,Object> mapValue,
-                                          @RequestParam("apiId") Integer apiId,
-                                          @RequestParam("pageNum") Integer pageNum,
-                                          @RequestParam("pageSize") Integer pageSize,
-                                          @RequestParam String con);
-
-    //新增承运商
-    @PostMapping(value = "api/v1/rms/rmscarrier/insertCarrier")
-    Map<String,Object> insertCarrier(@RequestBody(required = false) Map<String,Object> map);
-    //删除承运商
-    @PostMapping(value = "api/v1/rms/rmscarrier/deleteCarrier/{id}")
-    Map<String, Object> deleteCarrier(@PathVariable("id") BigDecimal id);
-    //    处理承运商照片
-    @PostMapping(value = "api/v1/rms/rmscarrier/uploadCarrier1" ,consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
-    String uploadCarrier1(@RequestPart("file") MultipartFile multipartFile);
-    //    处理承运商照片
-    @PostMapping("api/v1/rms/rmscarrier/uploadCarrier2")
-    int uploadCarrier2(@RequestParam("file")MultipartFile multipartFile);
-    //    处理承运商照片
-    @PostMapping("api/v1/rms/rmscarrier/uploadCarrier3")
-    int uploadCarrier3(@RequestPart("file") MultipartFile multipartFile);
-    //    更新承运商信息
-    @PostMapping(value = "api/v1/rms/rmscarrier/updateCarrier")
-    Map<String, Object> updateCarrier(@RequestBody(required = false) Map<String, Object> map);
-    //    根据id获取承运商信息
-    @PostMapping(value = "api/v1/rms/rmscarrier/getCarrierById/{id}")
-    Map<String, Object> getCarrierById(@PathVariable("id") BigDecimal id);
-//    展示中标区域
-    @PostMapping(value = "api/v1/rms/rmscarrier/getCarrierBidAreaList")
-    Map<String, Object> getCarrierBidAreaList(@RequestBody(required = false) Map<String,Object> mapValue,
-                                          @RequestParam("apiId") Integer apiId,
-                                          @RequestParam("pageNum") Integer pageNum,
-                                          @RequestParam("pageSize") Integer pageSize,
-                                          @RequestParam String con);
-
-    //获取物资列表
+    //===========物资种类
+    //查询物资种类List
+    @PostMapping(value = "api/v1/rms/rmsmaterialtype/getMaterialTypeList")
+    Map<String, Object> getMaterialTypeList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                            @RequestParam Integer pageNum,
+                                            @RequestParam Integer pageSize,
+                                            @RequestParam Integer apiId,
+                                            @RequestParam String con);
+    //新增物资种类
+    @PostMapping("api/v1/rms/rmsmaterialtype/insertMaterialType")
+    RESTfulResult insertMaterialType(@RequestBody(required = false) Map<String, Object> map);
+    //删除物资种类
+    @PostMapping(value = "api/v1/rms/rmsmaterialtype/deleteMaterialType")
+    RESTfulResult deleteMaterialType(@RequestBody(required = false) Map<String, Object> map);
+    //更新物资种类
+    @PostMapping(value = "api/v1/rms/rmsmaterialtype/updateMaterialType")
+    Map<String, Object> updateMaterialType(@RequestBody(required = false) Map<String, Object> map);
+    //查询物资种类id
+    @PostMapping(value = "api/v1/rms/rmsmaterialtype/getMaterialTypeById/{id}")
+    Map<String, Object> getMaterialTypeById(@PathVariable("id") BigDecimal id);
+
+    //==============物资
+    //查询物资List
     @PostMapping(value = "api/v1/rms/rmsmaterial/getMaterialList")
     Map<String,Object> getMaterialList(@RequestBody(required = false) Map<String,Object> mapValue,
                                        @RequestParam("apiId") Integer apiId,
                                        @RequestParam("pageNum") Integer pageNum,
                                        @RequestParam("pageSize") Integer pageSize,
                                        @RequestParam String con);
-
-
     //新增物资
     @PostMapping(value = "api/v1/rms/rmsmaterial/insertMaterial")
     Map<String, Object> insertMaterial(@RequestBody(required = false) Map<String, Object> map);
     //删除物资
-    @PostMapping(value = "api/v1/rms/rmsmaterial/deleteMaterial/{id}")
-    Map<String, Object> deleteMaterial(@PathVariable("id") BigDecimal id);
-    //    更新物资信息
+    @PostMapping(value = "api/v1/rms/rmsmaterial/deleteMaterial")
+    Map<String, Object> deleteMaterial(@RequestBody(required = false) Map<String, Object> map);
+    //更新物资信息
     @PostMapping(value = "api/v1/rms/rmsmaterial/updateMaterial")
     Map<String, Object> updateMaterial(@RequestBody(required = false) Map<String, Object> map);
-    //    根据id获取物资信息
+    //查询物资ID
     @PostMapping(value = "api/v1/rms/rmsmaterial/getMaterialById/{id}")
     Map<String, Object> getMaterialById(@PathVariable("id") BigDecimal id);
 
 
+    //人员管理
     @PostMapping(value = "api/v1/rms/rmspersonnel/insertPersonnel")
     Map<String, Object> insertPersonnel(@RequestBody(required = false) Map<String, Object> map);
-    //删除人员信息
     @PostMapping(value = "api/v1/rms/rmspersonnel/deletePersonnel/{id}")
     Map<String, Object> deletePersonnel(@PathVariable("id") BigDecimal id);
-    //    更新人员信息
     @PostMapping(value = "api/v1/rms/rmspersonnel/updatePersonnel")
     Map<String, Object> updatePersonnel(@RequestBody(required = false) Map<String, Object> map);
-    //    根据id获取人员信息
     @PostMapping(value = "api/v1/rms/rmspersonnel/getPersonnelById/{personnelId}")
     Map<String, Object> getPersonnelById(@PathVariable("personnelId") BigDecimal personnelId);
-    //    模糊查询人员信息
     @PostMapping(value = "/api/v1/rms/rmspersonnel/getPersonnelList")
     Map<String, Object> getPersonnelList(@RequestBody(required = false) Map<String,Object> mapVal,
                                          @RequestParam("apiId")Integer apiId,
                                          @RequestParam("pageNum") Integer pageNum,
                                          @RequestParam("pageSize") Integer pageSize,
                                          @RequestParam("con") String con);
-
-
-    //获得托运人列表
-    @PostMapping(value = "api/v1/rms/rmsshipper/getShipperList")
-    Map<String,Object>   getShipperList (@RequestBody(required = false) Map<String,Object> mapValue,
-                                         @RequestParam("apiId") Integer apiId,
-                                         @RequestParam("pageNum") Integer pageNum,
-                                         @RequestParam("pageSize") Integer pageSize,
-                                         @RequestParam String con);
-    //新增托运人信息
-    @PostMapping(value = "api/v1/rms/rmsshipper/insertShipper")
-    Map<String, Object> insertShipper(@RequestBody(required = false) Map<String, Object> map);
-    //删除托运人
-    @PostMapping(value = "api/v1/rms/rmsshipper/deleteShipper/{id}")
-    Map<String, Object> deleteShipper(@PathVariable("id") BigDecimal id);
-    //修改托运人信息
-    @PostMapping(value = "api/v1/rms/rmsshipper/updateShipper")
-    Map<String, Object> updateShipper(@RequestBody(required = false) Map<String, Object> map);
-    //根据id获取托运人信息
-    @PostMapping(value = "api/v1/rms/rmsshipper/getShipperById/{id}")
-    Map<String, Object> getShipperById(@PathVariable("id") BigDecimal id);
-
-    //展示供应商列表
-    @PostMapping(value = "api/v1/rms/rmssupplier/getSupplierList")
-    Map<String,Object>   getSupplierList (@RequestBody(required = false) Map<String,Object> mapValue,
+    //============公司
+    //展示公司列表
+    @PostMapping(value = "api/v1/rms/rmscompany/getCompanyList")
+    Map<String,Object>   getCompanyList (@RequestBody(required = false) Map<String,Object> mapValue,
                                           @RequestParam("apiId") Integer apiId,
                                           @RequestParam("pageNum") Integer pageNum,
-                                          @RequestParam("pageSize") Integer pageSize,
-                                          @RequestParam("con") String con);
-    //新增供应商信息
-    @PostMapping(value = "api/v1/rms/rmssupplier/insertSupplier")
-    Map<String, Object> insertSupplier(@RequestBody(required = false) Map<String, Object> map);
-    //删除供应商
-    @PostMapping(value = "api/v1/rms/rmssupplier/deleteSupplier/{id}")
-    Map<String, Object> deleteSupplier(@PathVariable("id") BigDecimal id);
-    //    更新供应商信息
-    @PostMapping(value = "api/v1/rms/rmssupplier/updateSupplier")
-    Map<String, Object> updateSupplier(@RequestBody(required = false) Map<String, Object> map);
+                                          @RequestParam("pageSize") Integer pageSize);
+    //新增公司
+    @PostMapping(value = "api/v1/rms/rmscompany/insertCompany")
+    Map<String, Object> insertCompany(@RequestBody(required = false) Map<String, Object> map);
+    //删除公司
+    @PostMapping(value = "api/v1/rms/rmscompany/deleteCompany")
+    Map<String, Object> deleteCompany(@RequestBody(required = false)  Map<String,Object> map);
+    //更新公司
+    @PostMapping(value = "api/v1/rms/rmscompany/updateCompany")
+    Map<String, Object> updateCompany(@RequestBody(required = false) Map<String, Object> map);
     //    根据id获取供应商信息
-    @PostMapping(value = "api/v1/rms/rmssupplier/getSupplierById/{id}")
-    Map<String, Object> getSupplierById(@PathVariable("id") BigDecimal id);
+    @PostMapping(value = "api/v1/rms/rmscompany/getCompanyById/{id}")
+    Map<String, Object> getCompanyById(@PathVariable("id") BigDecimal id);
+
 
+    //===========运力
     //新增运力
     @PostMapping(value = "api/v1/rms/rmscapacity/insertCapacity")
     Map<String, Object> insertCapacity(@RequestBody(required = false) Map<String, Object> map);
@@ -238,44 +197,7 @@ public interface RmsFeign {
     @PostMapping(value = "api/v1/rms/rmscapacity/getCapacityById/{id}")
     Map<String,Object> getCapacityById(@PathVariable("id") BigDecimal id);
 
-    //新增汽车衡
-    @PostMapping(value = "api/v1/rms/rmstruckcalculate/insertTruckCalculate")
-    Map<String, Object> insertTruckCalculate(@RequestBody(required = false) Map<String, Object> map);
-
-    //新增汽车衡下的物资
-    @PostMapping(value = "api/v1/rms/rmstruckcalculate/insertTruckCalculateOfMaterial")
-    Map<String, Object> insertTruckCalculateOfMaterial(@RequestBody(required = false) Map<String, Object> map);
-    //更新汽车衡
-    @PostMapping(value = "api/v1/rms/rmstruckcalculate/updateTruckCalculate")
-    Map<String, Object> updateTruckCalculate(@RequestBody Map<String, Object> map);
-    //根据id查询汽车衡
-    @PostMapping(value = "api/v1/rms/rmstruckcalculate/getTruckCalculateById/{id}")
-
-    Map<String, Object> getTruckCalculateById(@PathVariable("id") BigDecimal id);
-
-
-    //根据id删除汽车衡
-    @PostMapping(value = "api/v1/rms/rmstruckcalculate/deleteTruckCalculate/{id}")
-    Map<String, Object> deleteTruckCalculate(@PathVariable("id") BigDecimal id);
-
-    //根据id删除汽车衡与物资中间表
-    @PostMapping(value = "api/v1/rms/rmstruckcalculate/deleteTruckCalculateMaterial/{id}")
-    Map<String, Object> deleteTruckCalculateMaterial(@PathVariable("id") BigDecimal id);
-    //模糊查询汽车衡
-    @PostMapping(value = "api/v1/rms/rmstruckcalculate/getTruckCalculateList")
-    Map<String, Object> getTruckCalculateList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                              @RequestParam Integer pageNum,
-                                              @RequestParam Integer pageSize,
-                                              @RequestParam Integer apiId,
-                                              @RequestParam String con);
-    //汽车衡物资展示表
-    @PostMapping(value = "api/v1/rms/rmstruckcalculate/getCalculateOfMaterialList")
-    Map<String, Object> getCalculateOfMaterialList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                                   @RequestParam Integer pageNum,
-                                                   @RequestParam Integer pageSize,
-                                                   @RequestParam Integer apiId,
-                                                   @RequestParam BigDecimal truckCalculateId);
-
+    //==============仓库
     //新增仓库
     @PostMapping(value = "api/v1/rms/rmswarehouse/insertWarehouse")
     Map<String, Object> insertWarehouse(@RequestBody(required = false) Map<String, Object> map);
@@ -298,30 +220,32 @@ public interface RmsFeign {
                                          @RequestParam Integer apiId,
                                          @RequestParam String con);
 
-    //获取司机排队信息
+    //=================司机排班
+    //获取司机排班信息
     @PostMapping(value = "api/v1/rms/rmsdrivercapacity/getDriverCapacityList")
     Map<String, Object> getDriverCapacityList(@RequestBody(required = false) Map<String, Object> mapValue,
                                               @RequestParam("apiId") Integer apiId,
                                               @RequestParam("pageNum") Integer pageNum,
                                               @RequestParam("pageSize") Integer pageSize);
 
-    //新增司机排队信息
+    //新增司机排班信息
     @PostMapping(value = "api/v1/rms/rmsdrivercapacity/insertDriverCapacity")
     Map<String, Object> insertDriverCapacity(@RequestBody(required = false) Map<String, Object> map);
 
-    //更新司机排队信息
+    //更新司机排班信息
     @PostMapping(value = "api/v1/rms/rmsdrivercapacity/updateDriverCapacity")
     Map<String, Object> updateDriverCapacity(@RequestBody(required = false) Map<String, Object> map);
 
-    //删除司机排队信息
+    //删除司机排班信息
     @PostMapping(value = "api/v1/rms/rmsdrivercapacity/deleteDriverCapacity/{id}")
     Map<String, Object> deleteDriverCapacity(@PathVariable("id") BigDecimal id);
 
-    //根据id获取司机排队信息
+    //根据id获取司机排班
     @PostMapping(value = "api/v1/rms/rmsdrivercapacity/getDriverCapacityById/{id}")
     Map<String, Object> getDriverCapacityById(@PathVariable("id") BigDecimal id);
 
 
+    //================作业点
     //获取门岗信息列表
     @PostMapping(value = "api/v1/rms/rmsgatepost/getGatepostList")
     Map<String,Object>     getGatepostList(@RequestBody(required = false) Map<String,Object> mapValue,
@@ -362,19 +286,6 @@ public interface RmsFeign {
     @PostMapping(value ="api/v1/rms/rmsgatepost/getGatepostName/{gatepostId}")
     Map<String,Object> getGatepostName(@PathVariable("gatepostId")BigDecimal gatepostId);
 
-    //获取物资种类
-    @PostMapping(value = "api/v1/rms/rmsmaterialtype/getMaterialTypeList")
-    Map<String, Object> getMaterialTypeList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                            @RequestParam Integer pageNum,
-                                            @RequestParam Integer pageSize,
-                                            @RequestParam Integer apiId,
-                                            @RequestParam String con);
-
-    @PostMapping(value = "api/v1/rms/rmsmaterialtype/deleteMaterialForInward")
-    Map<String, Object> deleteMaterialForInward(@RequestBody(required = false) Map<String, Object> mapValue);
-
-    @PostMapping(value = "api/v1/rms/rmsmaterialtype/updateMaterialForInward")
-    Map<String, Object> updateMaterialForInward(@RequestBody(required = false) Map<String, Object> mapValue);
 
 
     //******************************************下拉框*******************************
@@ -475,91 +386,7 @@ public interface RmsFeign {
     @GetMapping(value = "api/v1/rms/dilnotices/getNoticeTypeId")
     Map<String,Object> getNoticeTypeId();
 
-  //展示收货客户信息
-  @PostMapping(value = "/api/v1/rms/rmsconsignee/getConsigneeList")
-  Map<String, Object> getConsigneeList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                            @RequestParam("apiId") Integer apiId,
-                                            @RequestParam("pageNum") Integer pageNum,
-                                            @RequestParam("pageSize") Integer pageSize,
-                                            @RequestParam("con") String con);
-
-
-    //新增收货客户信息
-    @PostMapping(value = "/api/v1/rms/rmsconsignee/insertConsignee")
-    Map<String, Object> insertConsignee(@RequestBody(required = false) Map<String, Object> map);
-    //删除收货客户信息
-    @PostMapping(value = "/api/v1/rms/rmsconsignee/deleteConsignee/{id}")
-    Map<String, Object> deleteConsignee(@PathVariable("id") BigDecimal id);
-    //修改收货客户信息
-    @PostMapping(value = "/api/v1/rms/rmsconsignee/updateConsignee")
-    Map<String, Object> updateConsignee(Map<String, Object> map);
-
-    //根据id获取收货客户信息详细信息
-    @PostMapping(value = "/api/v1/rms/rmsconsignee/getConsigneeById/{id}")
-    Map<String,Object> getConsigneeById(@PathVariable("id") BigDecimal id);
-
-
-
-    //边输入边搜索承运商
-    @PostMapping(value = "/api/v1/rms/rmscardriver/getCarrierName")
-    Map<String, Object> getCarrierName(@RequestParam(value = "state")String state);
-
-
-    //港口
-    @PostMapping(value = "api/v1/rms/rmsPort/insertPort")
-    Map<String,Object> insertPort(@RequestBody(required = false) Map<String,Object> map);
-
-    //删除港口
-    @PostMapping(value = "api/v1/rms/rmsPort//deletePort/{portId}")
-    Map<String, Object> deletePort(@PathVariable("portId") BigDecimal portId);
 
-    //删除码头
-    @PostMapping(value = "api/v1/rms/rmsPier//deletePier/{pierId}")
-    Map<String, Object> deletePier(@PathVariable("pierId") BigDecimal pierId);
-
-    @PostMapping(value = "/api/v1/rms/rmsPort/getPort")
-    Map<String, Object> getPortList(@RequestBody(required = false) Map<String , Object> mapVal,
-                                    @RequestParam Integer apiId,
-                                    @RequestParam Integer pageNum,
-                                    @RequestParam Integer pageSize,
-                                    @RequestParam String con);
-
-    @PostMapping(value = "/api/v1/rms/rmsPier/getPier")
-    Map<String, Object> getPierList(@RequestBody(required = false) Map<String, Object> mapVal,
-                                    @RequestParam Integer apiId,
-                                    @RequestParam Integer pageNum,
-                                    @RequestParam Integer pageSize,
-                                    @RequestParam String con);
-
-    @PostMapping(value = "/api/v1/rms/rmsPortYard/getPortYard")
-    Map<String, Object> getPortYardList(@RequestBody(required = false) Map<String, Object> mapVal,
-                                        @RequestParam Integer apiId,
-                                        @RequestParam Integer pageNum,
-                                        @RequestParam Integer pageSize,
-                                        @RequestParam String con);
-
-    @GetMapping(value = "api/v1/rms/rmsPort/getPortType")
-    Map<String, Object> getPortType();
-
-
-    @PostMapping(value = "api/v1/rms/rmsPier/insertPier")
-    Map<String, Object> insertPier(@RequestBody(required = false) Map<String, Object> map);
-
-    @PostMapping(value = "api/v1/rms/rmsPortYard/insertPortYard")
-    Map<String, Object> insertPortYard(@RequestBody(required = false) Map<String, Object> map);
-
-    //删除港存堆场
-    @PostMapping(value = "api/v1/rms/rmsPortYard/deletePortYard/{warehouseId}")
-    Map<String, Object> deletePortYard(@PathVariable("warehouseId") BigDecimal warehouseId);
-
-
-    // 得到二级部门的下拉
-    @GetMapping(value = "api/v1/rms/rmspersonnel/getSecondShipper")
-    Map<String, Object> getSecondShipper();
-
-    // 得到三级部门的下拉
-    @GetMapping(value = "api/v1/rms/rmspersonnel/getThirdShipper")
-    Map<String, Object> getThirdShipper(@RequestParam Integer shipperId);
 
     // 新增人员权限
     @PostMapping(value = "api/v1/rms/rmspersonnel/addPersonnel")
@@ -619,8 +446,7 @@ public interface RmsFeign {
                                             @RequestParam Integer pageSize,
                                             @RequestParam String con);
 
-    @PostMapping("api/v1/rms/rmsmaterialtype/insertMaterialType")
-    RESTfulResult insertMaterialType(@RequestBody(required = false) Map<String, Object> map);
+
 
     @PostMapping("api/v1/rms/rmscapacity/getCapacityInfoById/{id}")
     Map<String,Object> getCapacityInfoById(@PathVariable("id") Integer id);
@@ -648,36 +474,6 @@ public interface RmsFeign {
     Map<String, Object> signConsignee(@RequestBody Map<String, Object> mapVal);
 
 
-    @PostMapping(value = "/api/v1/rms/rmsPort/getPortName")
-    Map<String, Object> getPortName(@RequestParam("index") String index);
-
-    // 边输边查码头名称
-    @PostMapping(value = "/api/v1/rms/rmsPort/getPierName")
-    Map<String, Object> getPierName(@RequestParam("index") String index);
-
-    @PostMapping(value = "/api/v1/rms/bmsshipcontractprices/selectbmsshipContractPriceList")
-    Map<String, Object> selectbmsshipContractPriceList(@RequestBody(required = false) Map<String,Object> map,
-                                                       @RequestParam("apiId") Integer apiId,
-                                                       @RequestParam("pageNum") Integer pageNum,
-                                                       @RequestParam("pageSize") Integer pageSize,
-                                                       @RequestParam("con") String con,
-                                                       @RequestParam("startTime") String startTime,
-                                                       @RequestParam("endTime")String endTime);
-
-    @PostMapping(value = "/api/v1/rms/bmsshipcontractprices/insertBmsshipContractPrice")
-    Map<String, Object> insertBmsshipContractPrice(@RequestBody(required = false) Map<String, Object> map);
-
-    @PostMapping(value = "/api/v1/rms/bmsshipcontractprices/updateBmsshipContractPrice")
-    Map<String, Object> updateBmsshipContractPrice(@RequestBody(required = false) Map<String, Object> map);
-
-    // 删除船运合同单价
-    @PostMapping(value = "/api/v1/rms/bmsshipcontractprices/deleteBmsshipContractPrice")
-    Map<String, Object> deleteBmsshipContractPrice(@RequestBody(required = false) Map<String, Object> map);
-
-    // 渲染船运合同单价
-    @PostMapping(value = "/api/v1/rms/bmsshipcontractprices/selectBmsshipPriceList/{id}")
-    Map<String, Object> selectBmsshipPriceList(@PathVariable("id") BigDecimal id);
-
     //运力类型
     @PostMapping(value = "/api/v1/rms/rmscapacitytype/getCapacityType")
     Map<String, Object> getCapacityType(@RequestBody(required = false) Map<String,Object> map,
@@ -702,32 +498,4 @@ public interface RmsFeign {
 
     @PostMapping(value = "api/v1/rms/rmscapacitytype/insertTransRange")
     Map<String, Object> insertTransRange(@RequestBody(required = false) Map<String, Object> map);
-
-    //APP备注(RMS_MATERIAL_COKE)
-    @PostMapping(value = "/api/v1/rms/rmscapacitytype/getMaterialCoke")
-    Map<String, Object> getMaterialCoke(@RequestBody(required = false) Map<String,Object> map,
-                                      @RequestParam("apiId") Integer apiId,
-                                      @RequestParam("pageNum") Integer pageNum,
-                                      @RequestParam("pageSize") Integer pageSize,
-                                      @RequestParam("con") String con);
-
-    @PostMapping(value = "api/v1/rms/rmscapacitytype/insertMaterialCoke")
-    Map<String, Object> insertMaterialCoke(@RequestBody(required = false) Map<String, Object> map);
-
-    @PostMapping(value = "api/v1/rms/rmscapacitytype/deleteMaterialCoke/{id}")
-    Map<String, Object> deleteMaterialCoke(@PathVariable("id") BigDecimal id);
-
-    //收款客户(RMS_RECEIVE_COMPANY)
-    @PostMapping(value = "/api/v1/rms/rmscapacitytype/getReceiveCompany")
-    Map<String, Object> getReceiveCompany(@RequestBody(required = false) Map<String,Object> map,
-                                        @RequestParam("apiId") Integer apiId,
-                                        @RequestParam("pageNum") Integer pageNum,
-                                        @RequestParam("pageSize") Integer pageSize,
-                                        @RequestParam("con") String con);
-
-    @PostMapping(value = "api/v1/rms/rmscapacitytype/insertReceiveCompany")
-    Map<String, Object> insertReceiveCompany(@RequestBody(required = false) Map<String, Object> map);
-
-    @PostMapping(value = "api/v1/rms/rmscapacitytype/deleteReceiveCompany/{id}")
-    Map<String, Object> deleteReceiveCompany(@PathVariable("id") BigDecimal id);
 }

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

@@ -0,0 +1,13 @@
+package com.steerinfo.dil.mapper;
+
+import com.steerinfo.dil.model.LogResult;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import java.math.*;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+@Mapper
+public interface LogResultMapper extends IBaseMapper<LogResult, BigDecimal> {
+    @Select("select SEQ_LOG_RESULT.nextval from dual")
+    BigDecimal nextId();
+}

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

@@ -16,6 +16,9 @@ import java.util.Map;
 @Mapper
 public interface UniversalMapper {
 
+    //边输边查发货单位
+    List<Map<String, Object>> getCompanyMesByLike(String index);
+
     //查询所有的门岗（下拉框）
     List<Map<String, Object>> getAllGatepost();
 

src/main/java/com/steerinfo/dil/model/LogResult.java

@@ -0,0 +1,198 @@
+package com.steerinfo.dil.model;
+
+import com.steerinfo.framework.model.IBasePO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
+import java.util.Date;
+
+@ApiModel(value="日志表;外键ID和外键类型为查询参数。")
+public class LogResult implements IBasePO<BigDecimal> {
+    /**
+     * 主键序列号:SEQ_LOG_RESULT(LOG_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="主键序列号:SEQ_LOG_RESULT",required=true)
+    private BigDecimal logId;
+
+    /**
+     * 日志内容(LOG_CONTENT,VARCHAR,510)
+     */
+    @ApiModelProperty(value="日志内容",required=true)
+    private String logContent;
+
+    /**
+     * 外键ID(FOREIGN_KEY_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="外键ID",required=false)
+    private BigDecimal foreignKeyId;
+
+    /**
+     * 外键类型(FOREIGN_KEY_TYPE,VARCHAR,255)
+     */
+    @ApiModelProperty(value="外键类型",required=false)
+    private String foreignKeyType;
+
+    /**
+     * 方法名，包含完整路径(METHOD_NAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="方法名，包含完整路径",required=false)
+    private String methodName;
+
+    /**
+     * 方法描述(METHOD_DESCRIPTION,VARCHAR,50)
+     */
+    @ApiModelProperty(value="方法描述",required=false)
+    private String methodDescription;
+
+    /**
+     * 执行时长(EXE_COST,DECIMAL,38)
+     */
+    @ApiModelProperty(value="执行时长",required=false)
+    private BigDecimal exeCost;
+
+    /**
+     * 文件路径(FILE_PATH,VARCHAR,255)
+     */
+    @ApiModelProperty(value="文件路径",required=false)
+    private String filePath;
+
+    /**
+     * 新增时间(INSERT_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="新增时间",required=false)
+    private Date insertTime;
+
+    /**
+     * 新增用户(INSERT_USERNAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="新增用户",required=false)
+    private String insertUsername;
+
+    /**
+     * 备注(REMARK,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备注",required=false)
+    private String remark;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public BigDecimal getId() {
+        return this.logId;
+    }
+
+    @Override
+    public void setId(BigDecimal logId) {
+        this.logId = logId;
+    }
+
+    public BigDecimal getLogId() {
+        return logId;
+    }
+
+    public void setLogId(BigDecimal logId) {
+        this.logId = logId;
+    }
+
+    public String getLogContent() {
+        return logContent;
+    }
+
+    public void setLogContent(String logContent) {
+        this.logContent = logContent == null ? null : logContent.trim();
+    }
+
+    public BigDecimal getForeignKeyId() {
+        return foreignKeyId;
+    }
+
+    public void setForeignKeyId(BigDecimal foreignKeyId) {
+        this.foreignKeyId = foreignKeyId;
+    }
+
+    public String getForeignKeyType() {
+        return foreignKeyType;
+    }
+
+    public void setForeignKeyType(String foreignKeyType) {
+        this.foreignKeyType = foreignKeyType == null ? null : foreignKeyType.trim();
+    }
+
+    public String getMethodName() {
+        return methodName;
+    }
+
+    public void setMethodName(String methodName) {
+        this.methodName = methodName == null ? null : methodName.trim();
+    }
+
+    public String getMethodDescription() {
+        return methodDescription;
+    }
+
+    public void setMethodDescription(String methodDescription) {
+        this.methodDescription = methodDescription == null ? null : methodDescription.trim();
+    }
+
+    public BigDecimal getExeCost() {
+        return exeCost;
+    }
+
+    public void setExeCost(BigDecimal exeCost) {
+        this.exeCost = exeCost;
+    }
+
+    public String getFilePath() {
+        return filePath;
+    }
+
+    public void setFilePath(String filePath) {
+        this.filePath = filePath == null ? null : filePath.trim();
+    }
+
+    public Date getInsertTime() {
+        return insertTime;
+    }
+
+    public void setInsertTime(Date insertTime) {
+        this.insertTime = insertTime;
+    }
+
+    public String getInsertUsername() {
+        return insertUsername;
+    }
+
+    public void setInsertUsername(String insertUsername) {
+        this.insertUsername = insertUsername == null ? null : insertUsername.trim();
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark == null ? null : remark.trim();
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", logId=").append(logId);
+        sb.append(", logContent=").append(logContent);
+        sb.append(", foreignKeyId=").append(foreignKeyId);
+        sb.append(", foreignKeyType=").append(foreignKeyType);
+        sb.append(", methodName=").append(methodName);
+        sb.append(", methodDescription=").append(methodDescription);
+        sb.append(", exeCost=").append(exeCost);
+        sb.append(", filePath=").append(filePath);
+        sb.append(", insertTime=").append(insertTime);
+        sb.append(", insertUsername=").append(insertUsername);
+        sb.append(", remark=").append(remark);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

src/main/java/com/steerinfo/dil/service/LogService.java

@@ -0,0 +1,14 @@
+package com.steerinfo.dil.service;
+
+import com.steerinfo.dil.mapper.LogResultMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * 日志服务
+ */
+@Service
+public class LogService {
+    @Autowired
+    private LogResultMapper logResultMapper;
+}

src/main/java/com/steerinfo/dil/service/impl/UniversalServiceImpl.java

@@ -7,7 +7,6 @@ import com.steerinfo.dil.mapper.UniversalMapper;
 import com.steerinfo.dil.model.DilRoleOrgcodeTable;
 import com.steerinfo.dil.service.UniversalService;
 import com.steerinfo.dil.util.DataChange;
-import com.steerinfo.dil.util.ESUtil;
 import com.steerinfo.dil.util.HTTPRequestUtils;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/resources/application-dev.yml

@@ -1,61 +1,81 @@
+#测试环境配置文件
 spring:
   datasource:
-    url: jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri
-    password: root123
-    username: DAGANG
+    url: jdbc:oracle:thin:@172.16.90.214:1521/gxmes
+    password: gxmestest
+    username: gxmestest
     driver-class-name: oracle.jdbc.OracleDriver
   application:
     name: antai-api
+  mvc:
+    async:
+      request-timeout: 15000
+#  redis:
+#    # Redis本地服务器地址，注意要开启redis服务，即那个redis-server.exe
+#    host: 127.0.0.1
+#    # Redis服务器端口,默认为6379.若有改动按改动后的来
+#    port: 6379
+#    #Redis服务器连接密码，默认为空，若有设置按设置的来
+#    password:
+#    jedis:
+#      pool:
+#        # 连接池最大连接数，若为负数则表示没有任何限制
+#        max-active: 8
+#        # 连接池最大阻塞等待时间，若为负数则表示没有任何限制
+#        max-wait: -1
+#        # 连接池中的最大空闲连接
+#        max-idle: 8
+
+
 server:
   port: 8080
-
-#  druid:
-#    stat-view-servlet:
-#      #是否启用StatViewServlet(监控页面),默认true-启动，false-不启动
-#      enabled: false
-#      url-pattern: '/druid/*'
-#      # IP白名单(没有配置或者为空，则允许所有访问)
-#      allow:
-#      # IP黑名单(存在共同时,deny优先于allow)
-#      deny:
-#      # 禁用HTML页面上的"Reset All"功能
-#      reset-enable: false
-#      # 登录名
-#      login-username: admin
-#      # 登录密码
-#      login-password: dagang0426
+  tomcat:
+    max-threads: 1000
+    accept-count: 800
+eureka:
+  client:
+    registerWithEureka: false
+    fetchRegistry: false
 
 openfeign:
   ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:172.16.33.161:8083}
+    url: ${COLUMNDATAFEIGN_URL:172.16.90.214:8083}
   AmsFeign:
-    url: ${AMSFEIGN_URL:localhost:8015}
-  BmsshipFeign:
-    url: ${BMSSHIPFEIGN_URL:172.16.33.162:8007}
-  BmstrainFeign:
-    url: ${BMSTRAINFEIGN_URL:172.16.33.162:8005}
-  BmstruckFeign:
-    url: ${BMSTRUCKFEIGN_URL:172.16.33.162:8009}
-  QmsTruckFeign:
-    url: ${QMSTRUCKFEIGN_URL:localhost:8017}
-  TmsTrainFeign:
-    url: ${TMSTRAINFEIGN_URL:172.16.33.162:8004}
-  TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:localhost:8008}
-  TmsshipFeign:
-    url: ${TMSSHIPFEIGN_URL:172.16.33.162:8003}
-  WMSHFeign:
-    url: ${WMSHFEIGN_URL:localhost:8070}
+    url: ${AMSFEIGN_URL:localhost:8079}
+  BmsFeign:
+    url: ${BMSFEIGN_URL:localhost:8078}
+  TmsFeign:
+    url: ${TMSFEIGN_URL:localhost:8086}
   WMSFeign:
-    url: ${WMSFEIGN_URL:localhost:8012}
+    url: ${WMSFEIGN_URL:localhost:8093}
   OMSFeign:
-    url: ${OMSFEIGN_URL:localhost:8016}
+    url: ${OMSFEIGN_URL:localhost:8095}
   RmsFeign:
-    url: ${RMSFEIGN_HRL:localhost:8060}
-  JoinFeign:
-    url: ${JOINFEIGN_URL:172.16.33.162:8006}
+    url: ${RMSFEIGN_URL:localhost:8060}
+  IntegrationFeign:
+    url: ${INTEGRATIONFEIGN_URL:localhost:8066}
   OTMSFeign:
-    url: ${OTMSFEIGN_URL:172.16.33.162:8038}
+    url: ${OTMSFEIGN_URL:localhost:8038}
+
+#前缀
+prefix:
+  logPrefix: E:\logs\log\running.log.
+  picPrefix: E:\picture
 
-piction:
-  path: /shared
+#远程调用
+feign:
+  hystrix:
+    enabled: true #开启熔断，熔断时间和feign超时时间必须一致，否则时间短的生效
+  client:
+    config:
+      default:  #默认配置,连接时间要短，读取时间要长
+        connectTimeout: 1000 #单位毫秒
+        readTimeout: 10000 #单位毫秒
+#熔断器
+hystrix:
+  command:
+    default:
+      execution:
+        isolation:
+          thread:
+            timeoutInMilliseconds: 15000 #设置熔断时间,单位毫秒

src/main/resources/application-prod.yml

@@ -1,8 +1,9 @@
+#正式环境配置文件
 spring:
   datasource:
-    url: jdbc:oracle:thin:@175.6.82.29:1521:STEER
-    password: Dil123789
-    username: dil
+    url: jdbc:oracle:thin:@172.16.90.214:1521/gxmes
+    password: gxmestest
+    username: gxmestest
     driver-class-name: oracle.jdbc.OracleDriver
   application:
     name: antai-api
@@ -15,6 +16,10 @@ server:
   tomcat:
     max-threads: 1000
     accept-count: 800
+eureka:
+  client:
+    registerWithEureka: false
+    fetchRegistry: false
 
 openfeign:
   ColumnDataFeign:
@@ -36,5 +41,25 @@ openfeign:
   OTMSFeign:
     url: ${OTMSFEIGN_URL:localhost:8038}
 
-picture:
-  path: /shared
+#前缀
+prefix:
+  logPrefix: E:\logs\log\running.log.
+  picPrefix: E:\picture
+
+#远程调用
+feign:
+  hystrix:
+    enabled: true #开启熔断，熔断时间和feign超时时间必须一致，否则时间短的生效
+  client:
+    config:
+      default:  #默认配置,连接时间要短，读取时间要长
+        connectTimeout: 1000 #单位毫秒
+        readTimeout: 10000 #单位毫秒
+#熔断器
+hystrix:
+  command:
+    default:
+      execution:
+        isolation:
+          thread:
+            timeoutInMilliseconds: 15000 #设置熔断时间,单位毫秒

src/main/resources/bootstrap.yml

@@ -1,7 +1,7 @@
 api.version: api/v1
 spring:
   profiles:
-    include: ${SPRING_PROFILES:prod}
+    include: ${SPRING_PROFILES:dev}
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8

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

@@ -0,0 +1,366 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.steerinfo.dil.mapper.LogResultMapper">
+  <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.LogResult">
+    <id column="LOG_ID" jdbcType="DECIMAL" property="logId" />
+    <result column="LOG_CONTENT" jdbcType="VARCHAR" property="logContent" />
+    <result column="FOREIGN_KEY_ID" jdbcType="DECIMAL" property="foreignKeyId" />
+    <result column="FOREIGN_KEY_TYPE" jdbcType="VARCHAR" property="foreignKeyType" />
+    <result column="METHOD_NAME" jdbcType="VARCHAR" property="methodName" />
+    <result column="METHOD_DESCRIPTION" jdbcType="VARCHAR" property="methodDescription" />
+    <result column="EXE_COST" jdbcType="DECIMAL" property="exeCost" />
+    <result column="FILE_PATH" jdbcType="TIMESTAMP" property="filePath" />
+    <result column="INSERT_TIME" jdbcType="TIMESTAMP" property="insertTime" />
+    <result column="INSERT_USERNAME" jdbcType="VARCHAR" property="insertUsername" />
+    <result column="REMARK" jdbcType="VARCHAR" property="remark" />
+  </resultMap>
+  <sql id="columns">
+    LOG_ID, LOG_CONTENT, FOREIGN_KEY_ID, FOREIGN_KEY_TYPE, METHOD_NAME, METHOD_DESCRIPTION,
+    EXE_COST, FILE_PATH, INSERT_TIME, INSERT_USERNAME, REMARK
+  </sql>
+  <sql id="columns_alias">
+    t.LOG_ID, t.LOG_CONTENT, t.FOREIGN_KEY_ID, t.FOREIGN_KEY_TYPE, t.METHOD_NAME, t.METHOD_DESCRIPTION,
+    t.EXE_COST, t.FILE_PATH, t.INSERT_TIME, t.INSERT_USERNAME, t.REMARK
+  </sql>
+  <sql id="select">
+    SELECT <include refid="columns" /> FROM LOG_RESULT
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias" /> FROM LOG_RESULT t
+  </sql>
+  <sql id="where">
+    <where>
+      <if test="logId != null">
+        and LOG_ID = #{logId}
+      </if>
+      <if test="logContent != null and logContent != ''">
+        and LOG_CONTENT = #{logContent}
+      </if>
+      <if test="foreignKeyId != null">
+        and FOREIGN_KEY_ID = #{foreignKeyId}
+      </if>
+      <if test="foreignKeyType != null and foreignKeyType != ''">
+        and FOREIGN_KEY_TYPE = #{foreignKeyType}
+      </if>
+      <if test="methodName != null and methodName != ''">
+        and METHOD_NAME = #{methodName}
+      </if>
+      <if test="methodDescription != null and methodDescription != ''">
+        and METHOD_DESCRIPTION = #{methodDescription}
+      </if>
+      <if test="exeCost != null">
+        and EXE_COST = #{exeCost}
+      </if>
+      <if test="filePath != null">
+        and TO_CHAR(FILE_PATH,'yyyy-MM-dd') = #{filePath}
+      </if>
+      <if test="insertTime != null">
+        and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
+      </if>
+      <if test="insertUsername != null and insertUsername != ''">
+        and INSERT_USERNAME = #{insertUsername}
+      </if>
+      <if test="remark != null and remark != ''">
+        and REMARK = #{remark}
+      </if>
+    </where>
+  </sql>
+  <sql id="whereLike">
+    <where>
+      <if test="logId != null">
+        and LOG_ID = #{logId}
+      </if>
+      <if test="logContent != null and logContent != ''">
+        and LOG_CONTENT LIKE '%${logContent}%'
+      </if>
+      <if test="foreignKeyId != null">
+        and FOREIGN_KEY_ID = #{foreignKeyId}
+      </if>
+      <if test="foreignKeyType != null and foreignKeyType != ''">
+        and FOREIGN_KEY_TYPE LIKE '%${foreignKeyType}%'
+      </if>
+      <if test="methodName != null and methodName != ''">
+        and METHOD_NAME LIKE '%${methodName}%'
+      </if>
+      <if test="methodDescription != null and methodDescription != ''">
+        and METHOD_DESCRIPTION LIKE '%${methodDescription}%'
+      </if>
+      <if test="exeCost != null">
+        and EXE_COST = #{exeCost}
+      </if>
+      <if test="filePath != null">
+        and TO_CHAR(FILE_PATH,'yyyy-MM-dd') = #{filePath}
+      </if>
+      <if test="insertTime != null">
+        and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
+      </if>
+      <if test="insertUsername != null and insertUsername != ''">
+        and INSERT_USERNAME LIKE '%${insertUsername}%'
+      </if>
+      <if test="remark != null and remark != ''">
+        and REMARK LIKE '%${remark}%'
+      </if>
+    </where>
+  </sql>
+  <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
+    delete from LOG_RESULT
+    where LOG_ID = #{logId,jdbcType=DECIMAL}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from LOG_RESULT
+    where 1!=1
+    <if test="logContent != null and logContent != ''">
+      or LOG_CONTENT = #{logContent}
+    </if>
+    <if test="foreignKeyId != null">
+      or FOREIGN_KEY_ID = #{foreignKeyId}
+    </if>
+    <if test="foreignKeyType != null and foreignKeyType != ''">
+      or FOREIGN_KEY_TYPE = #{foreignKeyType}
+    </if>
+    <if test="methodName != null and methodName != ''">
+      or METHOD_NAME = #{methodName}
+    </if>
+    <if test="methodDescription != null and methodDescription != ''">
+      or METHOD_DESCRIPTION = #{methodDescription}
+    </if>
+    <if test="exeCost != null">
+      or EXE_COST = #{exeCost}
+    </if>
+    <if test="filePath != null">
+      or TO_CHAR(FILE_PATH,'yyyy-MM-dd') = '#{filePath}'
+    </if>
+    <if test="insertTime != null">
+      or TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = '#{insertTime}'
+    </if>
+    <if test="insertUsername != null and insertUsername != ''">
+      or INSERT_USERNAME = #{insertUsername}
+    </if>
+    <if test="remark != null and remark != ''">
+      or REMARK = #{remark}
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.steerinfo.dil.model.LogResult">
+    insert into LOG_RESULT (LOG_ID, LOG_CONTENT, FOREIGN_KEY_ID,
+                            FOREIGN_KEY_TYPE, METHOD_NAME, METHOD_DESCRIPTION,
+                            EXE_COST, FILE_PATH, INSERT_TIME,
+                            INSERT_USERNAME, REMARK)
+    values (#{logId,jdbcType=DECIMAL}, #{logContent,jdbcType=VARCHAR}, #{foreignKeyId,jdbcType=DECIMAL},
+            #{foreignKeyType,jdbcType=VARCHAR}, #{methodName,jdbcType=VARCHAR}, #{methodDescription,jdbcType=VARCHAR},
+            #{exeCost,jdbcType=DECIMAL}, #{filePath,jdbcType=TIMESTAMP}, #{insertTime,jdbcType=TIMESTAMP},
+            #{insertUsername,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.steerinfo.dil.model.LogResult">
+    insert into LOG_RESULT
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="logId != null">
+        LOG_ID,
+      </if>
+      <if test="logContent != null">
+        LOG_CONTENT,
+      </if>
+      <if test="foreignKeyId != null">
+        FOREIGN_KEY_ID,
+      </if>
+      <if test="foreignKeyType != null">
+        FOREIGN_KEY_TYPE,
+      </if>
+      <if test="methodName != null">
+        METHOD_NAME,
+      </if>
+      <if test="methodDescription != null">
+        METHOD_DESCRIPTION,
+      </if>
+      <if test="exeCost != null">
+        EXE_COST,
+      </if>
+      <if test="filePath != null">
+        FILE_PATH,
+      </if>
+      <if test="insertTime != null">
+        INSERT_TIME,
+      </if>
+      <if test="insertUsername != null">
+        INSERT_USERNAME,
+      </if>
+      <if test="remark != null">
+        REMARK,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="logId != null">
+        #{logId,jdbcType=DECIMAL},
+      </if>
+      <if test="logContent != null">
+        #{logContent,jdbcType=VARCHAR},
+      </if>
+      <if test="foreignKeyId != null">
+        #{foreignKeyId,jdbcType=DECIMAL},
+      </if>
+      <if test="foreignKeyType != null">
+        #{foreignKeyType,jdbcType=VARCHAR},
+      </if>
+      <if test="methodName != null">
+        #{methodName,jdbcType=VARCHAR},
+      </if>
+      <if test="methodDescription != null">
+        #{methodDescription,jdbcType=VARCHAR},
+      </if>
+      <if test="exeCost != null">
+        #{exeCost,jdbcType=DECIMAL},
+      </if>
+      <if test="filePath != null">
+        #{filePath,jdbcType=TIMESTAMP},
+      </if>
+      <if test="insertTime != null">
+        #{insertTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="insertUsername != null">
+        #{insertUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="remark != null">
+        #{remark,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.LogResult">
+    update LOG_RESULT
+    set LOG_CONTENT = #{logContent,jdbcType=VARCHAR},
+        FOREIGN_KEY_ID = #{foreignKeyId,jdbcType=DECIMAL},
+        FOREIGN_KEY_TYPE = #{foreignKeyType,jdbcType=VARCHAR},
+        METHOD_NAME = #{methodName,jdbcType=VARCHAR},
+        METHOD_DESCRIPTION = #{methodDescription,jdbcType=VARCHAR},
+        EXE_COST = #{exeCost,jdbcType=DECIMAL},
+        FILE_PATH = #{filePath,jdbcType=TIMESTAMP},
+        INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+        INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+        REMARK = #{remark,jdbcType=VARCHAR}
+    where LOG_ID = #{logId,jdbcType=DECIMAL}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.LogResult">
+    update LOG_RESULT
+    <set>
+      <if test="logContent != null">
+        LOG_CONTENT = #{logContent,jdbcType=VARCHAR},
+      </if>
+      <if test="foreignKeyId != null">
+        FOREIGN_KEY_ID = #{foreignKeyId,jdbcType=DECIMAL},
+      </if>
+      <if test="foreignKeyType != null">
+        FOREIGN_KEY_TYPE = #{foreignKeyType,jdbcType=VARCHAR},
+      </if>
+      <if test="methodName != null">
+        METHOD_NAME = #{methodName,jdbcType=VARCHAR},
+      </if>
+      <if test="methodDescription != null">
+        METHOD_DESCRIPTION = #{methodDescription,jdbcType=VARCHAR},
+      </if>
+      <if test="exeCost != null">
+        EXE_COST = #{exeCost,jdbcType=DECIMAL},
+      </if>
+      <if test="filePath != null">
+        FILE_PATH = #{filePath,jdbcType=TIMESTAMP},
+      </if>
+      <if test="insertTime != null">
+        INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="insertUsername != null">
+        INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="remark != null">
+        REMARK = #{remark,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where LOG_ID = #{logId,jdbcType=DECIMAL}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
+    <include refid="select" />
+    where LOG_ID = #{logId,jdbcType=DECIMAL}
+  </select>
+  <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select" />
+    <include refid="where" />
+  </select>
+  <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select" />
+    <include refid="whereLike" />
+  </select>
+  <insert id="batchInsert" parameterType="java.util.List">
+    insert into LOG_RESULT
+    (LOG_ID,
+    LOG_CONTENT, FOREIGN_KEY_ID, FOREIGN_KEY_TYPE,
+    METHOD_NAME, METHOD_DESCRIPTION,
+    EXE_COST, FILE_PATH, INSERT_TIME,
+    INSERT_USERNAME, REMARK)
+    ( <foreach collection="list" item="item" separator="union all">
+    select
+    #{item.logId,jdbcType=DECIMAL},
+    #{item.logContent,jdbcType=VARCHAR}, #{item.foreignKeyId,jdbcType=DECIMAL}, #{item.foreignKeyType,jdbcType=VARCHAR},
+    #{item.methodName,jdbcType=VARCHAR}, #{item.methodDescription,jdbcType=VARCHAR},
+    #{item.exeCost,jdbcType=DECIMAL}, #{item.filePath,jdbcType=TIMESTAMP}, #{item.insertTime,jdbcType=TIMESTAMP},
+    #{item.insertUsername,jdbcType=VARCHAR}, #{item.remark,jdbcType=VARCHAR} from dual
+  </foreach> )
+  </insert>
+  <update id="batchUpdate" parameterType="java.util.List">
+    update LOG_RESULT
+    set
+    LOG_ID=
+    <foreach close="end" collection="list" index="index" item="item" open="case LOG_ID" separator=" ">
+      when #{item.logId,jdbcType=DECIMAL} then #{item.logId,jdbcType=DECIMAL}
+    </foreach>
+    ,LOG_CONTENT=
+    <foreach close="end" collection="list" index="index" item="item" open="case LOG_ID" separator=" ">
+      when #{item.logId,jdbcType=DECIMAL} then #{item.logContent,jdbcType=VARCHAR}
+    </foreach>
+    ,FOREIGN_KEY_ID=
+    <foreach close="end" collection="list" index="index" item="item" open="case LOG_ID" separator=" ">
+      when #{item.logId,jdbcType=DECIMAL} then #{item.foreignKeyId,jdbcType=DECIMAL}
+    </foreach>
+    ,FOREIGN_KEY_TYPE=
+    <foreach close="end" collection="list" index="index" item="item" open="case LOG_ID" separator=" ">
+      when #{item.logId,jdbcType=DECIMAL} then #{item.foreignKeyType,jdbcType=VARCHAR}
+    </foreach>
+    ,METHOD_NAME=
+    <foreach close="end" collection="list" index="index" item="item" open="case LOG_ID" separator=" ">
+      when #{item.logId,jdbcType=DECIMAL} then #{item.methodName,jdbcType=VARCHAR}
+    </foreach>
+    ,METHOD_DESCRIPTION=
+    <foreach close="end" collection="list" index="index" item="item" open="case LOG_ID" separator=" ">
+      when #{item.logId,jdbcType=DECIMAL} then #{item.methodDescription,jdbcType=VARCHAR}
+    </foreach>
+    ,EXE_COST=
+    <foreach close="end" collection="list" index="index" item="item" open="case LOG_ID" separator=" ">
+      when #{item.logId,jdbcType=DECIMAL} then #{item.exeCost,jdbcType=DECIMAL}
+    </foreach>
+    ,FILE_PATH=
+    <foreach close="end" collection="list" index="index" item="item" open="case LOG_ID" separator=" ">
+      when #{item.logId,jdbcType=DECIMAL} then #{item.filePath,jdbcType=TIMESTAMP}
+    </foreach>
+    ,INSERT_TIME=
+    <foreach close="end" collection="list" index="index" item="item" open="case LOG_ID" separator=" ">
+      when #{item.logId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
+    </foreach>
+    ,INSERT_USERNAME=
+    <foreach close="end" collection="list" index="index" item="item" open="case LOG_ID" separator=" ">
+      when #{item.logId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
+    </foreach>
+    ,REMARK=
+    <foreach close="end" collection="list" index="index" item="item" open="case LOG_ID" separator=" ">
+      when #{item.logId,jdbcType=DECIMAL} then #{item.remark,jdbcType=VARCHAR}
+    </foreach>
+    where LOG_ID in
+    <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
+      #{item.logId,jdbcType=DECIMAL}
+    </foreach>
+  </update>
+  <delete id="batchDelete" parameterType="java.util.List">
+    delete from LOG_RESULT
+    where LOG_ID in
+    <foreach close=")" collection="list" item="id" open="(" separator=",">
+      #{id}
+    </foreach>
+  </delete>
+  <!-- 友情提示！！！-->
+  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+
+</mapper>

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

@@ -102,4 +102,18 @@
         SELECT DL.VERSION_VALUE FROM DIL_VERSION DL
         WHERE DL.VERSION_ID = 11
     </select>
+
+
+    <!--  边输边查公司  -->
+    <select id="getCompanyMesByLike" parameterType="string" resultType="java.util.Map">
+        select
+            RC.COMPANY_ID "companyId",
+            RC.COMPANY_NAME "value",
+            RC.COMPANY_NAME "companyName"
+        from RMS_COMPANY RC
+        where instr(RC.COMPANY_NAME, #{index}) > 0
+        and DELETED = 0
+        order by RC.COMPANY_ID
+        FETCH NEXT 10 ROWS ONLY
+    </select>
 </mapper>

src/main/resources/log4j.properties

@@ -1,32 +1,11 @@
 ## LOG4J配置
-log4j.rootCategory=INFO,file, RUNNING,errorfile
+log4j.rootCategory=INFO,stdout,RUNNING,errorfile
 ## 控制台输出
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.Threshold = INFO
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
 log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss,SSS}:%5p %20t [%50F:%3L] - %m%n
 
-## root日志输出到文件
-log4j.appender.file=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.file.file=/logsdata/logs/springboot-log4j-root.log
-log4j.appender.file.DatePattern='.'yyyy-MM-dd
-log4j.appender.file.layout=org.apache.log4j.PatternLayout
-log4j.appender.file.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss,SSS}:%5p %20t [%50F:%3L] - %m%n
-
-## 按不同package进行输出
-## com.steer包下的日志配置
-log4j.category.market=DEBUG, steerfile
-log4j.category.com.hnshituo=DEBUG, steerfile
-#log4j.category.com.steer=${logging.level.com.steer}, steerfile
-log4j.category.com.steer=DEBUG, steerfile
-# com.steer下的日志输出
-log4j.appender.steerfile=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.steerfile.file=/logsdata/logs/springboot-log4j-steer.log
-log4j.appender.steerfile.DatePattern='.'yyyy-MM-dd
-log4j.appender.steerfile.layout=org.apache.log4j.PatternLayout
-#log4j.appender.steerfile.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss,SSS} %5p %c{1}:%L - %m%n
-log4j.appender.steerfile.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss,SSS}:%5p %20t [%50F:%3L] - %m%n
-
-
 ## ERROR级别输出到特定的日志文件中
 log4j.logger.error=errorfile
 ## 异常日志####
@@ -35,7 +14,6 @@ log4j.appender.errorfile.file=/logs/exception/exc.log
 log4j.appender.errorfile.DatePattern='.'yyyy-MM-dd
 log4j.appender.errorfile.Threshold = ERROR
 log4j.appender.errorfile.layout=org.apache.log4j.PatternLayout
-#log4j.appender.errorfile.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss,SSS} %5p %c{1}:%L - %m%n
 log4j.appender.errorfile.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss,SSS}:%5p %20t [%50F:%3L] - %m%n
 
 ### 运行日志 ###
@@ -47,8 +25,6 @@ log4j.appender.RUNNING.DatePattern='.'yyyy-MM-dd.
 log4j.appender.RUNNING.layout = org.apache.log4j.PatternLayout
 log4j.appender.RUNNING.layout.ConversionPattern = %d{yyyy-MM-dd HH:mm:ss,SSS}:%5p %20t [%50F:%3L] - %m%n
 
-### 指定类###
-log4j.logger.com.steer.rbac.sysdebuglog.service.DebugLogRecord = DEBUG,DEB
 ## 调试日志 ###
 log4j.appender.DEB = org.apache.log4j.DailyRollingFileAppender
 log4j.appender.DEB.File = /logs/debug/debug.log
@@ -56,25 +32,4 @@ log4j.appender.DEB.Append = true
 log4j.appender.DEB.Threshold = DEBUG 
 log4j.appender.DEB.DatePattern='.'yyyy-MM-dd
 log4j.appender.DEB.layout = org.apache.log4j.PatternLayout
-log4j.appender.DEB.layout.ConversionPattern = %d{yyyy-MM-dd HH:mm:ss,SSS}:%5p %20t [%50F:%3L] - %m%n
-####[%p] [%-d{yyyy-MM-dd HH:mm:ss}] %C.%M(%L) | %m%n
-
-#### 业务日志###
-log4j.logger.com.steer.rbac.sysoperlog.service.BizLogRecord = INFO,BIZ
-log4j.appender.BIZ = org.apache.log4j.DailyRollingFileAppender
-log4j.appender.BIZ.File = /logs/business/biz.log
-log4j.appender.BIZ.Append = true
-log4j.appender.BIZ.Threshold = INFO
-log4j.appender.BIZ.DatePattern='.'yyyy-MM-dd
-log4j.appender.BIZ.layout = org.apache.log4j.PatternLayout
-log4j.appender.BIZ.layout.ConversionPattern = %d{yyyy-MM-dd HH:mm:ss,SSS}:%5p %20t [%50F:%3L] - %m%n
-#
-#
-#### 资源日志###
-#log4j.appender.ENV = org.apache.log4j.DailyRollingFileAppender
-#log4j.appender.ENV.File = ../logs/env/env.log
-#log4j.appender.ENV.Append = true
-#log4j.appender.ENV.Threshold = INFO
-#log4j.appender.ENV.DatePattern='.'yyyy-MM-dd
-#1420.3og4j.appender.ENV.layout = org.apache.log4j.PatternLayout
-#log4j.appender.ENV.layout.ConversionPattern = %d{yyyy-MM-dd HH:mm:ss,SSS}:%5p %20t [%50F:%3L] - %m%n
+log4j.appender.DEB.layout.ConversionPattern = %d{yyyy-MM-dd HH:mm:ss,SSS}:%5p %20t [%50F:%3L] - %m%n