1.redis拦截器

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

@@ -9,6 +9,6 @@ import java.lang.annotation.*;
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
 public @interface RequestLimit {
-    int seconds() default 3;//秒
+    int seconds() default 1;//秒
     int maxCount() default 1;//最大访问次数
 }

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

@@ -0,0 +1,75 @@
+package com.steerinfo.dil.config;
+
+import com.alibaba.fastjson.JSON;
+import com.steerinfo.dil.annotaion.RequestLimit;
+import com.steerinfo.framework.cache.server.redis.RedisCache;
+import com.steerinfo.framework.controller.RESTfulResult;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.messaging.handler.HandlerMethod;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
+
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.Objects;
+
+@Component
+public class RepeatRequestIntercept extends HandlerInterceptorAdapter {
+    @Autowired
+    private RedisCache redisUtils;
+    @Override
+    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
+        //判断请求是否为方法的请求
+        if (handler instanceof HandlerMethod) {
+            HandlerMethod hm = (HandlerMethod) handler;
+            //获取方法中是否有幂等性注解
+            RequestLimit anno = hm.getMethodAnnotation(RequestLimit.class);
+            //若注解为空则直接返回
+            if (Objects.isNull(anno)) {
+                return true;
+            }
+            int seconds = anno.seconds();
+            int max = anno.maxCount();
+            String key = request.getRemoteAddr() + "-" + request.getMethod() + "-" + request.getRequestURL();
+            Object requestCountObj = redisUtils.get(key);
+            if (Objects.isNull(requestCountObj)) {
+                //若为空则为第一次请求
+                redisUtils.setex(key, 1,"ok");
+            } else {
+                //限定时间内的第n次请求
+                int requestCount = Integer.parseInt(requestCountObj.toString());
+                //判断是否超过最大限定请求次数
+                if (requestCount < max) {
+                    //未超过则请求次数+1
+                    redisUtils.incr(key, 1);
+                } else {
+                    //否则拒绝请求并返回信息
+                    refuse(response);
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
+    /**
+     * @param response
+     * @date 2023-08-10 15:25
+     * @author Bummon
+     * @description 拒绝请求并返回结果
+     */
+    private void refuse(HttpServletResponse response) throws IOException {
+        response.setContentType("application/json;charset=utf-8");
+        ServletOutputStream os = response.getOutputStream();
+        RESTfulResult result = new RESTfulResult();
+        result.setFailed();
+        result.setMessage("请求已提交，请勿重复请求");
+        result.setCode("100");
+        String jsonString = JSON.toJSONString(result);
+        os.write(jsonString.getBytes());
+        os.flush();
+        os.close();
+    }
+}

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

@@ -14,8 +14,14 @@ public class WebConfig extends WebMvcConfigurerAdapter {
     @Autowired
     private SessionInterceptor interceptor;
 
+    @Autowired
+    private RepeatRequestIntercept repeatRequestIntercept;
+
     @Override
     public void addInterceptors(InterceptorRegistry registry) {
+
         registry.addInterceptor(interceptor);
+        registry.addInterceptor(repeatRequestIntercept);
     }
+
 }

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

@@ -109,10 +109,15 @@ public class EMSController extends BaseRESTfulController {
 
     @ApiOperation(value = "账单详情更新")
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
-    @LogAround(foreignKeys = {"settlementId"}, foreignKeyTypes = {"异常处理"})
-    @PostMapping("/emssettlementorderupdate/{id}")
-    public Map<String, Object> emssettlementorderupdate(@RequestBody(required = false) Map<String, Object> map){
-        return emsFeign.emssettlementorderupdate(map);
+    @LogAround(foreignKeys = {"settlementId"}, foreignKeyTypes = {"账单详情更新"})
+    @PutMapping("/emssettlementorderupdate/{id}")
+    public Map<String, Object> emssettlementorderupdate(@PathVariable BigDecimal id,@RequestBody(required = false) Map<String, Object> map) throws ParseException {
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+        Date settlementStartDate = simpleDateFormat.parse(map.get("settlementStartDate").toString());
+        Date settlementEndDate = simpleDateFormat.parse(map.get("settlementEndDate").toString());
+        map.put("settlementStartDate",settlementStartDate);
+        map.put("settlementEndDate",settlementEndDate);
+        return emsFeign.emssettlementorderupdate(id,map);
     }
 
     @ApiOperation(value = "异常处理")

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

@@ -2,6 +2,7 @@ package com.steerinfo.dil.controller;
 
 
 import com.steerinfo.dil.annotaion.LogAround;
+import com.steerinfo.dil.annotaion.RequestLimit;
 import com.steerinfo.dil.feign.AmsFeign;
 import com.steerinfo.dil.feign.RmsFeign;
 import com.steerinfo.dil.feign.TmsFeign;
@@ -56,15 +57,16 @@ public class TMSController extends BaseRESTfulController {
     })
     @PostMapping(value = "/getcomprehensiveresults")
     public Map<String, Object> getecomprehensiveresultslist(@RequestBody(required = false) Map<String, Object> map, Integer apiId,
-                                               Integer pageNum,
-                                               Integer pageSize) {
+                                                            Integer pageNum,
+                                                            Integer pageSize) {
         return tmsFeign.getAmsSalaryContracList(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
     }
-    @ApiOperation(value="新增车辆实绩")
+
+    @ApiOperation(value = "新增车辆实绩")
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
-    @LogAround(foreignKeys = {"resultId"},foreignKeyTypes = {"计算公式"})
+    @LogAround(foreignKeys = {"resultId"}, foreignKeyTypes = {"计算公式"})
     @PostMapping("/addcomprehensiveresults")
-    public  Map<String, Object> insertcomprehensiveresults(@RequestBody(required = false) Map<String, Object> map) throws ParseException {
+    public Map<String, Object> insertcomprehensiveresults(@RequestBody(required = false) Map<String, Object> map) throws ParseException {
         if (!map.isEmpty()) {
             if (!map.get("resultTime").toString().isEmpty()) {
                 SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
@@ -72,48 +74,48 @@ public class TMSController extends BaseRESTfulController {
                 map.put("resultTime", resultTime);
             }
         }
-        map.put("insertUsername",  map.get("userName").toString());
-        return  tmsFeign.insertAmsSalaryContrac(map);
+        map.put("insertUsername", map.get("userName").toString());
+        return tmsFeign.insertAmsSalaryContrac(map);
     }
 
-    @ApiOperation(value="车辆实绩删除")
+    @ApiOperation(value = "车辆实绩删除")
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
     @PutMapping(value = "/comprehensiveresultslogicdelete")
-    @LogAround(foreignKeys = {"resultId"},foreignKeyTypes = {"计算公式"})
-    public Map<String, Object> comprehensiveresultsLogicDelete(@RequestBody(required = false) Map<String, Object> map){
+    @LogAround(foreignKeys = {"resultId"}, foreignKeyTypes = {"计算公式"})
+    public Map<String, Object> comprehensiveresultsLogicDelete(@RequestBody(required = false) Map<String, Object> map) {
         return tmsFeign.logicdeleteAmsSaalryContrac(map);
     }
 
-    @ApiOperation(value="修改车辆实绩")
+    @ApiOperation(value = "修改车辆实绩")
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
     @PutMapping(value = "/comprehensiveresultsupadete/{id}")
-    @LogAround(foreignKeys = {"resultId"},foreignKeyTypes = {"计算公式"})
-    public Map<String, Object> comprehensiveresultsUpdate(@PathVariable BigDecimal id,@RequestBody(required = false) Map<String, Object> map){
+    @LogAround(foreignKeys = {"resultId"}, foreignKeyTypes = {"计算公式"})
+    public Map<String, Object> comprehensiveresultsUpdate(@PathVariable BigDecimal id, @RequestBody(required = false) Map<String, Object> map) {
         map.put("updateUsername", map.get("userName").toString());
-        return tmsFeign.updateAmsSalaryContrac(id,map);
+        return tmsFeign.updateAmsSalaryContrac(id, map);
     }
 
-    @ApiOperation(value="派发运输订单")
+    @ApiOperation(value = "派发运输订单")
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
     @PostMapping(value = "/dispatchOrder")
-    @LogAround(foreignKeys = {"transOrderId"},foreignKeyTypes = {"运输订单"})
-    public Map<String, Object> dispatchOrder(@RequestBody(required = false) Map<String, Object> map){
+    @LogAround(foreignKeys = {"transOrderId"}, foreignKeyTypes = {"运输订单"})
+    public Map<String, Object> dispatchOrder(@RequestBody(required = false) Map<String, Object> map) {
         return tmsFeign.dispatchOrder(map);
     }
 
-    @ApiOperation(value="更改运输订单状态")
+    @ApiOperation(value = "更改运输订单状态")
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
     @PostMapping(value = "/changeTransOrder")
-    @LogAround(foreignKeys = {"transOrderId"},foreignKeyTypes = {"运输订单"})
-    public Map<String, Object> changeTransOrder(@RequestBody(required = false) Map<String, Object> map){
+    @LogAround(foreignKeys = {"transOrderId"}, foreignKeyTypes = {"运输订单"})
+    public Map<String, Object> changeTransOrder(@RequestBody(required = false) Map<String, Object> map) {
         return tmsFeign.changeTransOrder(map);
     }
 
-    @ApiOperation(value="司机接收运单")
+    @ApiOperation(value = "司机接收运单")
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
     @PostMapping(value = "/receiptOrder")
-    @LogAround(foreignKeys = {"transOrderId"},foreignKeyTypes = {"运输订单"})
-    public Map<String, Object> receiptOrder(@RequestBody(required = false) Map<String, Object> map){
+    @LogAround(foreignKeys = {"transOrderId"}, foreignKeyTypes = {"运输订单"})
+    public Map<String, Object> receiptOrder(@RequestBody(required = false) Map<String, Object> map) {
         return tmsFeign.receiptOrder(map);
     }
 
@@ -123,159 +125,161 @@ public class TMSController extends BaseRESTfulController {
                                                  Integer apiId,
                                                  Integer pageNum,
                                                  Integer pageSize) {
-        return tmsFeign.getTransOrderList(map ==null ? new HashMap<>() : map, apiId, pageNum, pageSize);
+        return tmsFeign.getTransOrderList(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
     }
 
-    @ApiOperation(value="查询运输订单所有运输实绩")
+    @ApiOperation(value = "查询运输订单所有运输实绩")
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
     @PostMapping(value = "/getTransResult")
-    public Map<String, Object> getTransResult(@RequestBody(required = false) Map<String, Object> map){
+    public Map<String, Object> getTransResult(@RequestBody(required = false) Map<String, Object> map) {
         return tmsFeign.getTransResult(map);
     }
 
-    @ApiOperation(value="同步进厂")
+    @ApiOperation(value = "同步进厂")
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
     @PostMapping(value = "/syncEnfactoryResult")
-    @LogAround(foreignKeys = {"resultId"},foreignKeyTypes = {"进厂实绩"})
-    public Map<String, Object> syncEnfactoryResult(@RequestBody(required = false) Map<String, Object> map){
+    @LogAround(foreignKeys = {"resultId"}, foreignKeyTypes = {"进厂实绩"})
+    public Map<String, Object> syncEnfactoryResult(@RequestBody(required = false) Map<String, Object> map) {
         return tmsFeign.syncEnfactoryResult(map);
     }
 
-    @ApiOperation(value="同步出厂")
+    @ApiOperation(value = "同步出厂")
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
     @PostMapping(value = "/syncOutfactoryResult")
-    @LogAround(foreignKeys = {"resultId"},foreignKeyTypes = {"出厂实绩"})
-    public Map<String, Object> syncOutfactoryResult(@RequestBody(required = false) Map<String, Object> map){
+    @LogAround(foreignKeys = {"resultId"}, foreignKeyTypes = {"出厂实绩"})
+    public Map<String, Object> syncOutfactoryResult(@RequestBody(required = false) Map<String, Object> map) {
         return tmsFeign.syncOutfactoryResult(map);
     }
 
-    @ApiOperation(value="同步计量")
+    @ApiOperation(value = "同步计量")
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
     @PostMapping(value = "/syncWeightResult")
-    @LogAround(foreignKeys = {"resultId"},foreignKeyTypes = {"计量实绩"})
-    public Map<String, Object> syncWeightResult(@RequestBody(required = false) Map<String, Object> map){
+    @LogAround(foreignKeys = {"resultId"}, foreignKeyTypes = {"计量实绩"})
+    public Map<String, Object> syncWeightResult(@RequestBody(required = false) Map<String, Object> map) {
         return tmsFeign.syncWeightResult(map);
     }
 
-<<<<<<< HEAD
-    @ApiOperation(value="计时")
+    @ApiOperation(value = "计时")
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @RequestLimit()
     @PostMapping(value = "/startend")
-    @LogAround(foreignKeys = {"resultId"},foreignKeyTypes = {"计时"})
-    public Map<String, Object> start(@RequestBody(required = false) Map<String, Object> map){
+    @LogAround(foreignKeys = {"resultId"}, foreignKeyTypes = {"计时"})
+    public Map<String, Object> start(@RequestBody(required = false) Map<String, Object> map) {
         return tmsFeign.startend(map);
     }
 
     @ApiOperation(value = "查询计时")
     @PostMapping("/tmstimingresultsList")
     public Map<String, Object> tmstimingresultsList(@RequestBody(required = false) Map<String, Object> map,
-                                                 Integer apiId,
-                                                 Integer pageNum,
-                                                 Integer pageSize) {
-        return tmsFeign.tmstimingresultsList(map ==null ? new HashMap<>() : map, apiId, pageNum, pageSize);
+                                                    Integer apiId,
+                                                    Integer pageNum,
+                                                    Integer pageSize) {
+        return tmsFeign.tmstimingresultsList(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
     }
 
-    @ApiOperation(value="修改计时")
+    @ApiOperation(value = "修改计时")
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
     @PostMapping(value = "/tmstimingresultsUpdate")
-    @LogAround(foreignKeys = {"resultId"},foreignKeyTypes = {"修改计时"})
-    public Map<String, Object> tmstimingresultsUpdate(@RequestBody(required = false) Map<String, Object> map){
+    @LogAround(foreignKeys = {"resultId"}, foreignKeyTypes = {"修改计时"})
+    public Map<String, Object> tmstimingresultsUpdate(@RequestBody(required = false) Map<String, Object> map) {
         return tmsFeign.tmstimingresultsUpdate(map);
-=======
+    }
 
-    @ApiOperation(value="销售派发运输订单")
+    @ApiOperation(value = "销售派发运输订单")
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
     @PostMapping(value = "/saleDispatchOrder")
-    @LogAround(foreignKeys = {"transOrderId"},foreignKeyTypes = {"运输订单"})
-    public Map<String, Object> saleDispatchOrder(@RequestBody(required = false) Map<String, Object> map){
+    @LogAround(foreignKeys = {"transOrderId"}, foreignKeyTypes = {"运输订单"})
+    public Map<String, Object> saleDispatchOrder(@RequestBody(required = false) Map<String, Object> map) {
         return tmsFeign.saleDispatchOrder(map);
     }
 
     @ApiOperation(value = "查询销售运输订单")
     @PostMapping("/getSaleTransOrderList")
     public Map<String, Object> getSaleTransOrderList(@RequestBody(required = false) Map<String, Object> map,
-                                                 Integer apiId,
-                                                 Integer pageNum,
-                                                 Integer pageSize) {
+                                                     Integer apiId,
+                                                     Integer pageNum,
+                                                     Integer pageSize) {
         return tmsFeign.getSaleTransOrderList(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
     }
-    @ApiOperation(value="同步质检")
+
+    @ApiOperation(value = "同步质检")
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
     @PostMapping(value = "/syncQualityResult")
-    @LogAround(foreignKeys = {"resultId"},foreignKeyTypes = {"质检实绩"})
-    public Map<String, Object> syncQualityResult(@RequestBody(required = false) Map<String, Object> map){
+    @LogAround(foreignKeys = {"resultId"}, foreignKeyTypes = {"质检实绩"})
+    public Map<String, Object> syncQualityResult(@RequestBody(required = false) Map<String, Object> map) {
         return tmsFeign.syncQualityResult(map);
     }
-    @ApiOperation(value="签到")
+
+    @ApiOperation(value = "签到")
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
     @PostMapping(value = "/signIn")
-    @LogAround(foreignKeys = {"resultId"},foreignKeyTypes = {"签到实绩"})
-    public Map<String, Object> signIn(@RequestBody(required = false) Map<String, Object> map){
+    @LogAround(foreignKeys = {"resultId"}, foreignKeyTypes = {"签到实绩"})
+    public Map<String, Object> signIn(@RequestBody(required = false) Map<String, Object> map) {
         return tmsFeign.signIn(map);
     }
 
-    @ApiOperation(value="换车头")
+    @ApiOperation(value = "换车头")
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
     @PostMapping(value = "/replaceFront")
-    @LogAround(foreignKeys = {"resultId"},foreignKeyTypes = {"换车头实绩"})
-    public Map<String, Object> replaceFront(@RequestBody(required = false) Map<String, Object> map){
+    @LogAround(foreignKeys = {"resultId"}, foreignKeyTypes = {"换车头实绩"})
+    public Map<String, Object> replaceFront(@RequestBody(required = false) Map<String, Object> map) {
         return tmsFeign.replaceFront(map);
     }
 
-    @ApiOperation(value="装货")
+    @ApiOperation(value = "装货")
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
     @PostMapping(value = "/load")
-    @LogAround(foreignKeys = {"resultId"},foreignKeyTypes = {"装货实绩"})
-    public Map<String, Object> load(@RequestBody(required = false) Map<String, Object> map){
+    @LogAround(foreignKeys = {"resultId"}, foreignKeyTypes = {"装货实绩"})
+    public Map<String, Object> load(@RequestBody(required = false) Map<String, Object> map) {
         return tmsFeign.load(map);
     }
 
-    @ApiOperation(value="装货修改")
+    @ApiOperation(value = "装货修改")
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
     @PostMapping(value = "/loadUpd")
-    @LogAround(foreignKeys = {"resultId"},foreignKeyTypes = {"装货实绩"})
-    public Map<String, Object> loadUpd(@RequestBody(required = false) Map<String, Object> map){
+    @LogAround(foreignKeys = {"resultId"}, foreignKeyTypes = {"装货实绩"})
+    public Map<String, Object> loadUpd(@RequestBody(required = false) Map<String, Object> map) {
         return tmsFeign.loadUpd(map);
     }
 
-    @ApiOperation(value="卸货")
+    @ApiOperation(value = "卸货")
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
     @PostMapping(value = "/unload")
-    @LogAround(foreignKeys = {"resultId"},foreignKeyTypes = {"卸货实绩"})
-    public Map<String, Object> unload(@RequestBody(required = false) Map<String, Object> map){
+    @LogAround(foreignKeys = {"resultId"}, foreignKeyTypes = {"卸货实绩"})
+    public Map<String, Object> unload(@RequestBody(required = false) Map<String, Object> map) {
         return tmsFeign.unload(map);
     }
 
-    @ApiOperation(value="卸货修改")
+    @ApiOperation(value = "卸货修改")
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
     @PostMapping(value = "/unloadUpd")
-    @LogAround(foreignKeys = {"resultId"},foreignKeyTypes = {"卸货实绩"})
-    public Map<String, Object> unloadUpd(@RequestBody(required = false) Map<String, Object> map){
+    @LogAround(foreignKeys = {"resultId"}, foreignKeyTypes = {"卸货实绩"})
+    public Map<String, Object> unloadUpd(@RequestBody(required = false) Map<String, Object> map) {
         return tmsFeign.unloadUpd(map);
     }
 
-    @ApiOperation(value="抵达")
+    @ApiOperation(value = "抵达")
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
     @PostMapping(value = "/arrival")
-    @LogAround(foreignKeys = {"resultId"},foreignKeyTypes = {"抵达实绩"})
-    public Map<String, Object> arrival(@RequestBody(required = false) Map<String, Object> map){
+    @LogAround(foreignKeys = {"resultId"}, foreignKeyTypes = {"抵达实绩"})
+    public Map<String, Object> arrival(@RequestBody(required = false) Map<String, Object> map) {
         return tmsFeign.arrival(map);
     }
 
-    @ApiOperation(value="签收")
+    @ApiOperation(value = "签收")
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
     @PostMapping(value = "/receipt")
-    @LogAround(foreignKeys = {"resultId"},foreignKeyTypes = {"签收实绩"})
-    public Map<String, Object> receipt(@RequestBody(required = false) Map<String, Object> map){
+    @LogAround(foreignKeys = {"resultId"}, foreignKeyTypes = {"签收实绩"})
+    public Map<String, Object> receipt(@RequestBody(required = false) Map<String, Object> map) {
         return tmsFeign.receipt(map);
     }
 
 
-    @ApiOperation(value="查询厂内车辆数")
+    @ApiOperation(value = "查询厂内车辆数")
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
     @PostMapping(value = "/getCountEnfactory")
-    public Map<String, Object> getCountEnfactory(@RequestBody(required = false) Map<String, Object> map){
-        return tmsFeign.getCountEnfactory(map == null ? new HashMap<>():map);
+    public Map<String, Object> getCountEnfactory(@RequestBody(required = false) Map<String, Object> map) {
+        return tmsFeign.getCountEnfactory(map == null ? new HashMap<>() : map);
     }
 
     @ApiOperation(value = "查询签到")
@@ -284,7 +288,7 @@ public class TMSController extends BaseRESTfulController {
                                                    Integer apiId,
                                                    Integer pageNum,
                                                    Integer pageSize) {
-        return tmsFeign.getSignInResultList(map ==null ? new HashMap<>() : map, apiId, pageNum, pageSize);
+        return tmsFeign.getSignInResultList(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
     }
 
     @ApiOperation(value = "查询换车头")
@@ -293,25 +297,26 @@ public class TMSController extends BaseRESTfulController {
                                                          Integer apiId,
                                                          Integer pageNum,
                                                          Integer pageSize) {
-        return tmsFeign.getReplaceFrontResultList(map ==null ? new HashMap<>() : map, apiId, pageNum, pageSize);
+        return tmsFeign.getReplaceFrontResultList(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
     }
 
     @ApiOperation(value = "查询进厂")
     @PostMapping("/getEnfactoryResultList")
     public Map<String, Object> getEnfactoryResultList(@RequestBody(required = false) Map<String, Object> map,
-                                                 Integer apiId,
-                                                 Integer pageNum,
-                                                 Integer pageSize) {
-        return tmsFeign.getEnfactoryResultList(map ==null ? new HashMap<>() : map, apiId, pageNum, pageSize);
+                                                      Integer apiId,
+                                                      Integer pageNum,
+                                                      Integer pageSize) {
+        return tmsFeign.getEnfactoryResultList(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
     }
 
     @ApiOperation(value = "查询出厂")
     @PostMapping("/getOutfactoryResultList")
-    public Map<String, Object> getTmsOutfactoryResultList(@RequestBody(required = false) Map<String, Object> map,
-                                                 Integer apiId,
-                                                 Integer pageNum,
-                                                 Integer pageSize) {
-        return tmsFeign.getOutfactoryResultList(map ==null ? new HashMap<>() : map, apiId, pageNum, pageSize);
+    public Map<String, Object> getTmsOutfactoryResultList
+            (@RequestBody(required = false) Map<String, Object> map,
+             Integer apiId,
+             Integer pageNum,
+             Integer pageSize) {
+        return tmsFeign.getOutfactoryResultList(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
     }
 
     @ApiOperation(value = "查询装货")
@@ -320,57 +325,57 @@ public class TMSController extends BaseRESTfulController {
                                                  Integer apiId,
                                                  Integer pageNum,
                                                  Integer pageSize) {
-        return tmsFeign.getLoadResultList(map ==null ? new HashMap<>() : map, apiId, pageNum, pageSize);
+        return tmsFeign.getLoadResultList(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
     }
 
 
     @ApiOperation(value = "查询卸货")
     @PostMapping("/getUnloadResultList")
     public Map<String, Object> getUnloadResultList(@RequestBody(required = false) Map<String, Object> map,
-                                                 Integer apiId,
-                                                 Integer pageNum,
-                                                 Integer pageSize) {
-        return tmsFeign.getUnloadResultList(map ==null ? new HashMap<>() : map, apiId, pageNum, pageSize);
+                                                   Integer apiId,
+                                                   Integer pageNum,
+                                                   Integer pageSize) {
+        return tmsFeign.getUnloadResultList(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
     }
 
     @ApiOperation(value = "查询计量")
     @PostMapping("/getWeightResultList")
     public Map<String, Object> getWeightResultList(@RequestBody(required = false) Map<String, Object> map,
-                                                 Integer apiId,
-                                                 Integer pageNum,
-                                                 Integer pageSize) {
-        return tmsFeign.getWeightResultList(map ==null ? new HashMap<>() : map, apiId, pageNum, pageSize);
+                                                   Integer apiId,
+                                                   Integer pageNum,
+                                                   Integer pageSize) {
+        return tmsFeign.getWeightResultList(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
     }
 
     @ApiOperation(value = "查询质检")
     @PostMapping("/getQualityResultList")
     public Map<String, Object> getQualityResult(@RequestBody(required = false) Map<String, Object> map,
-                                                 Integer apiId,
-                                                 Integer pageNum,
-                                                 Integer pageSize) {
-        return tmsFeign.getQualityResultList(map ==null ? new HashMap<>() : map, apiId, pageNum, pageSize);
+                                                Integer apiId,
+                                                Integer pageNum,
+                                                Integer pageSize) {
+        return tmsFeign.getQualityResultList(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
     }
 
     @ApiOperation(value = "查询抵达")
     @PostMapping("/getArrivalResultList")
     public Map<String, Object> getArrivalResultList(@RequestBody(required = false) Map<String, Object> map,
-                                                 Integer apiId,
-                                                 Integer pageNum,
-                                                 Integer pageSize) {
-        return tmsFeign.getArrivalResultList(map ==null ? new HashMap<>() : map, apiId, pageNum, pageSize);
+                                                    Integer apiId,
+                                                    Integer pageNum,
+                                                    Integer pageSize) {
+        return tmsFeign.getArrivalResultList(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
     }
 
     @ApiOperation(value = "查询签收")
     @PostMapping("/getReceiptResultList")
     public Map<String, Object> getReceiptResultList(@RequestBody(required = false) Map<String, Object> map,
-                                                 Integer apiId,
-                                                 Integer pageNum,
-                                                 Integer pageSize){
-            return tmsFeign.getReceiptResultList(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
+                                                    Integer apiId,
+                                                    Integer pageNum,
+                                                    Integer pageSize) {
+        return tmsFeign.getReceiptResultList(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
 
-        }
+    }
 
-    @ApiOperation(value="采购火运装货作业")
+    @ApiOperation(value = "采购火运装货作业")
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
     @PostMapping(value = "/purchaseTrainLoad")
 //    @LogAround(foreignKeys = {"resultId"},foreignKeyTypes = {"装货实绩"})
@@ -378,7 +383,7 @@ public class TMSController extends BaseRESTfulController {
                                                  String materialType,
                                                  String userId,
                                                  String userName) throws Exception {
-        File excel =  ExcelToolUtils.multipartFileToFile(file);
+        File excel = ExcelToolUtils.multipartFileToFile(file);
         FileInputStream is = null;
         String fileName = excel.getName();
         // 解决fileName兼容性问题
@@ -387,84 +392,83 @@ public class TMSController extends BaseRESTfulController {
         if (fileName != null && fileName.length() > 0) {
             is = new FileInputStream(excel);
         }
-        Map<String,Object> map = new HashMap<>();
+        Map<String, Object> map = new HashMap<>();
         //获取Excel中包含的对象数组
-        List<Map<String,Object>> list = ExcelToolUtils.getExcelList(is, fileName, 0);
+        List<Map<String, Object>> list = ExcelToolUtils.getExcelList(is, fileName, 0);
         List<String> capacityIds = new ArrayList<>();
-        for(Map<String,Object> item:list){
+        for (Map<String, Object> item : list) {
             capacityIds.add(item.get("车号").toString());
         }
-        map.put("list",list);
+        map.put("list", list);
         //校验当前excel是否已经导过
-        if(universalMapper.checkTrainOrder(map) > 0){
+        if (universalMapper.checkTrainOrder(map) > 0) {
             throw new Exception("存在24小时内的重复运单！不允许重复导入！");
         }
         //统计通知单的重量车数和车牌号
-        Set<String>  capacitySet = new HashSet<>();//车牌号
-        for (Map<String,Object> item : list){
+        Set<String> capacitySet = new HashSet<>();//车牌号
+        for (Map<String, Object> item : list) {
             //通知单统计
             String requirementNumber = item.get("通知单号").toString();
-            if(map.get("requirementNumber") != null){
-                if(map.get("requirementNumber").equals(requirementNumber)){
+            if (map.get("requirementNumber") != null) {
+                if (map.get("requirementNumber").equals(requirementNumber)) {
                     //已存在，修改
                     BigDecimal weight = DataChange.dataToBigDecimal(map.get("weight"));
                     BigDecimal truckNumber = DataChange.dataToBigDecimal(map.get("truckNumber"));
                     weight = weight.add(DataChange.dataToBigDecimal(item.get("净重")));
                     truckNumber = truckNumber.add(new BigDecimal(1));
-                    map.put("weight",weight);
-                    map.put("truckNumber",truckNumber);
-                }else{
+                    map.put("weight", weight);
+                    map.put("truckNumber", truckNumber);
+                } else {
                     throw new Exception("同一个Excel文件中只允许有一个采购订单号！");
                 }
-            }else{
+            } else {
                 //不存在，新增
                 BigDecimal weight = DataChange.dataToBigDecimal(item.get("净重"));
                 BigDecimal truckNumber = new BigDecimal(1);
-                map.put("requirementNumber",requirementNumber);
-                map.put("weight",weight);
-                map.put("truckNumber",truckNumber);
+                map.put("requirementNumber", requirementNumber);
+                map.put("weight", weight);
+                map.put("truckNumber", truckNumber);
             }
             //车牌号去重
             capacitySet.add(item.get("车号").toString());
         }
         //新增火车运力资源
         String[] capacities = capacitySet.toArray(new String[0]);//车牌号
-        if(capacities.length != list.size()){
+        if (capacities.length != list.size()) {
             throw new Exception("车号不允许重复！");
-        }else{
-            new Runnable(){
+        } else {
+            new Runnable() {
                 @Override
                 public void run() {
-                    Map<String,Object> capacityMap = new HashMap<>();
-                    capacityMap.put("capacities",capacities);
-                    capacityMap.put("userId",userId);
-                    capacityMap.put("userName",userName);
+                    Map<String, Object> capacityMap = new HashMap<>();
+                    capacityMap.put("capacities", capacities);
+                    capacityMap.put("userId", userId);
+                    capacityMap.put("userName", userName);
                     rmsFeign.batchInsertCapacityTrain(capacityMap);
                 }
             }.run();
         }
         //新增AMS及TMS
-        map.put("userId",userId);
-        map.put("userName",userName);
-        map.put("materialType",materialType);
-        return tmsFeign.purchaseTrainLoad(map,userId,userName);
+        map.put("userId", userId);
+        map.put("userName", userName);
+        map.put("materialType", materialType);
+        return tmsFeign.purchaseTrainLoad(map, userId, userName);
     }
 
     @ApiOperation(value = "查询采购火运装货")
     @PostMapping("/purchaseTrainLoadList")
     public Map<String, Object> purchaseTrainLoadList(@RequestBody(required = false) Map<String, Object> map,
-                                                 Integer apiId,
-                                                 Integer pageNum,
-                                                 Integer pageSize) {
-        return tmsFeign.purchaseTrainLoadList(map ==null ? new HashMap<>() : map, apiId, pageNum, pageSize);
+                                                     Integer apiId,
+                                                     Integer pageNum,
+                                                     Integer pageSize) {
+        return tmsFeign.purchaseTrainLoadList(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
     }
 
-    @ApiOperation(value="更改销售运输订单状态")
+    @ApiOperation(value = "更改销售运输订单状态")
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
     @PostMapping(value = "/changeSaleTransOrder")
-    @LogAround(foreignKeys = {"transOrderId"},foreignKeyTypes = {"销售运输订单"})
+    @LogAround(foreignKeys = {"transOrderId"}, foreignKeyTypes = {"销售运输订单"})
     public Map<String, Object> changeSaleTransOrder(@RequestBody(required = false) Map<String, Object> map) {
         return tmsFeign.changeSaleTransOrder(map);
->>>>>>> deadaae9127aedbf357007f7909d98950956f7ce
     }
 }

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

@@ -29,9 +29,7 @@ public interface EmsFeign {
     @PostMapping("api/v1/ems/emsdetailsorders/abnormal")
     Map<String, Object> abnormal(@RequestBody(required = false) Map<String, Object> map);
     @PutMapping("api/v1/ems/emssettlementorders/emssettlementorderupdate/{id}")
-    Map<String, Object> emssettlementorderupdate(@RequestBody(required = false) Map<String, Object> map);
-
-
+    Map<String, Object> emssettlementorderupdate(@PathVariable BigDecimal id,@RequestBody(required = false) Map<String, Object> map);
 
     @PutMapping("api/v1/ems/emsdetailsorders/emsdetailsordersdelete/{id}")
     Map<String, Object> emsdetailsordersdelete(@PathVariable BigDecimal id,@RequestBody(required = false) Map<String, Object> map);

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

@@ -24,15 +24,15 @@ public interface TmsFeign {
 
     //======================>车辆综合实绩
     @PostMapping("api/v1/tms/tmscomprehensiveresults/gettmscomprehensiveresult")
-    Map<String, Object> getAmsSalaryContracList(@RequestBody(required = false) Map<String, Object> map,@RequestParam  Integer apiId,
-                                                @RequestParam  Integer pageNum,
-                                                @RequestParam  Integer pageSize);
+    Map<String, Object> getAmsSalaryContracList(@RequestBody(required = false) Map<String, Object> map, @RequestParam Integer apiId,
+                                                @RequestParam Integer pageNum,
+                                                @RequestParam Integer pageSize);
 
     @PostMapping("api/v1/tms/tmscomprehensiveresults/add")
     Map<String, Object> insertAmsSalaryContrac(@RequestBody(required = false) Map<String, Object> map);
 
     @PutMapping("api/v1/tms/tmscomprehensiveresults/{id}")
-    Map<String, Object> updateAmsSalaryContrac(@PathVariable BigDecimal id,@RequestBody(required = false) Map<String, Object> map);
+    Map<String, Object> updateAmsSalaryContrac(@PathVariable BigDecimal id, @RequestBody(required = false) Map<String, Object> map);
 
     @PutMapping("api/v1/tms/tmscomprehensiveresults/logicdelete")
     Map<String, Object> logicdeleteAmsSaalryContrac(@RequestBody(required = false) Map<String, Object> map);
@@ -42,9 +42,9 @@ public interface TmsFeign {
 
     @PostMapping("api/v1/tms/omstransorders/getTransOrderList")
     Map<String, Object> getTransOrderList(@RequestBody(required = false) Map<String, Object> map,
-                                                @RequestParam  Integer apiId,
-                                                @RequestParam  Integer pageNum,
-                                                @RequestParam  Integer pageSize);
+                                          @RequestParam Integer apiId,
+                                          @RequestParam Integer pageNum,
+                                          @RequestParam Integer pageSize);
 
 
     @PostMapping("api/v1/tms/omstransorders/changeTransOrder")
@@ -66,7 +66,6 @@ public interface TmsFeign {
     Map<String, Object> syncWeightResult(Map<String, Object> map);
 
 
-<<<<<<< HEAD
     @PostMapping("api/v1/tms/tmstimingresults/startend")
     Map<String, Object> startend(Map<String, Object> map);
 
@@ -76,19 +75,20 @@ public interface TmsFeign {
 
     @PostMapping("api/v1/tms/tmstimingresults/tmstimingresultsList")
     Map<String, Object> tmstimingresultsList(@RequestBody(required = false) Map<String, Object> map,
-=======
+                                             @RequestParam Integer apiId,
+                                             @RequestParam Integer pageNum,
+                                             @RequestParam Integer pageSize);
+
     @PostMapping("api/v1/tms/omstransorders/saleDispatchOrder")
     Map<String, Object> saleDispatchOrder(@RequestBody(required = false) Map<String, Object> map);
 
     @PostMapping("api/v1/tms/omstransorders/getSaleTransOrderList")
     Map<String, Object> getSaleTransOrderList(@RequestBody(required = false) Map<String, Object> map,
->>>>>>> deadaae9127aedbf357007f7909d98950956f7ce
-                                          @RequestParam  Integer apiId,
-                                          @RequestParam  Integer pageNum,
-                                          @RequestParam  Integer pageSize);
+                                              @RequestParam Integer apiId,
+                                              @RequestParam Integer pageNum,
+                                              @RequestParam Integer pageSize);
+
 
-<<<<<<< HEAD
-=======
     @PostMapping("api/v1/tms/tmsqualityresults/syncQualityResult")
     Map<String, Object> syncQualityResult(Map<String, Object> map);
 
@@ -118,82 +118,82 @@ public interface TmsFeign {
     Map<String, Object> receipt(Map<String, Object> map);
 
     @PostMapping("api/v1/tms/omstransorders/getCountEnfactory")
-    Map<String, Object>  getCountEnfactory(@RequestBody(required = false) Map<String, Object> map);
+    Map<String, Object> getCountEnfactory(@RequestBody(required = false) Map<String, Object> map);
 
     @PostMapping("api/v1/tms/tmssigninresults/getSignInResultList")
     Map<String, Object> getSignInResultList(@RequestBody(required = false) Map<String, Object> map,
-                                            @RequestParam  Integer apiId,
-                                            @RequestParam  Integer pageNum,
-                                            @RequestParam  Integer pageSize);
+                                            @RequestParam Integer apiId,
+                                            @RequestParam Integer pageNum,
+                                            @RequestParam Integer pageSize);
 
     @PostMapping("api/v1/tms/tmsreplacefrontresults/getReplaceFrontResultList")
     Map<String, Object> getReplaceFrontResultList(@RequestBody(required = false) Map<String, Object> map,
-                                                  @RequestParam  Integer apiId,
-                                                  @RequestParam  Integer pageNum,
-                                                  @RequestParam  Integer pageSize);
+                                                  @RequestParam Integer apiId,
+                                                  @RequestParam Integer pageNum,
+                                                  @RequestParam Integer pageSize);
 
     @PostMapping("api/v1/tms/tmsenfactoryresults/getEnfactoryResultList")
     Map<String, Object> getEnfactoryResultList(@RequestBody(required = false) Map<String, Object> map,
-                                          @RequestParam  Integer apiId,
-                                          @RequestParam  Integer pageNum,
-                                          @RequestParam  Integer pageSize);
+                                               @RequestParam Integer apiId,
+                                               @RequestParam Integer pageNum,
+                                               @RequestParam Integer pageSize);
 
     @PostMapping("api/v1/tms/tmsoutfactoryresults/getOutfactoryResultList")
     Map<String, Object> getOutfactoryResultList(@RequestBody(required = false) Map<String, Object> map,
-                                              @RequestParam  Integer apiId,
-                                              @RequestParam  Integer pageNum,
-                                              @RequestParam  Integer pageSize);
+                                                @RequestParam Integer apiId,
+                                                @RequestParam Integer pageNum,
+                                                @RequestParam Integer pageSize);
 
     @PostMapping("api/v1/tms/tmsloadresults/getLoadResultList")
     Map<String, Object> getLoadResultList(@RequestBody(required = false) Map<String, Object> map,
-                                                   @RequestParam  Integer apiId,
-                                                   @RequestParam  Integer pageNum,
-                                                   @RequestParam  Integer pageSize);
+                                          @RequestParam Integer apiId,
+                                          @RequestParam Integer pageNum,
+                                          @RequestParam Integer pageSize);
 
     @PostMapping("api/v1/tms/tmsloadresults/purchaseTrainLoadList")
     Map<String, Object> purchaseTrainLoadList(@RequestBody(required = false) Map<String, Object> map,
-                                          @RequestParam  Integer apiId,
-                                          @RequestParam  Integer pageNum,
-                                          @RequestParam  Integer pageSize);
+                                              @RequestParam Integer apiId,
+                                              @RequestParam Integer pageNum,
+                                              @RequestParam Integer pageSize);
 
     @PostMapping("api/v1/tms/tmsunloadresults/getUnloadResultList")
     Map<String, Object> getUnloadResultList(@RequestBody(required = false) Map<String, Object> map,
-                                          @RequestParam  Integer apiId,
-                                          @RequestParam  Integer pageNum,
-                                          @RequestParam  Integer pageSize);
+                                            @RequestParam Integer apiId,
+                                            @RequestParam Integer pageNum,
+                                            @RequestParam Integer pageSize);
 
     @PostMapping("api/v1/tms/tmsweightresults/getWeightResultList")
     Map<String, Object> getWeightResultList(@RequestBody(required = false) Map<String, Object> map,
-                                            @RequestParam  Integer apiId,
-                                            @RequestParam  Integer pageNum,
-                                            @RequestParam  Integer pageSize);
+                                            @RequestParam Integer apiId,
+                                            @RequestParam Integer pageNum,
+                                            @RequestParam Integer pageSize);
 
     @PostMapping("api/v1/tms/tmsqualityresults/getQualityResultList")
     Map<String, Object> getQualityResultList(@RequestBody(required = false) Map<String, Object> map,
-                                            @RequestParam  Integer apiId,
-                                            @RequestParam  Integer pageNum,
-                                            @RequestParam  Integer pageSize);
+                                             @RequestParam Integer apiId,
+                                             @RequestParam Integer pageNum,
+                                             @RequestParam Integer pageSize);
 
     @PostMapping("api/v1/tms/tmsarrivalresults/getArrivalResultList")
     Map<String, Object> getArrivalResultList(@RequestBody(required = false) Map<String, Object> map,
-                                         @RequestParam  Integer apiId,
-                                         @RequestParam  Integer pageNum,
-                                         @RequestParam  Integer pageSize);
+                                             @RequestParam Integer apiId,
+                                             @RequestParam Integer pageNum,
+                                             @RequestParam Integer pageSize);
 
     @PostMapping("api/v1/tms/tmsreceiptresults/getReceiptResultList")
     Map<String, Object> getReceiptResultList(@RequestBody(required = false) Map<String, Object> map,
-                                         @RequestParam  Integer apiId,
-                                         @RequestParam  Integer pageNum,
-                                         @RequestParam  Integer pageSize);
+                                             @RequestParam Integer apiId,
+                                             @RequestParam Integer pageNum,
+                                             @RequestParam Integer pageSize);
 
     @PostMapping("api/v1/tms/tmsloadresults/purchaseTrainLoad")
     Map<String, Object> purchaseTrainLoad(Map<String, Object> map,
-                                          @RequestParam  String userId,
-                                          @RequestParam  String userName);
+                                          @RequestParam String userId,
+                                          @RequestParam String userName);
 
     @PostMapping("api/v1/tms/omstransorders/changeSaleTransOrder")
     Map<String, Object> changeSaleTransOrder(Map<String, Object> map);
->>>>>>> deadaae9127aedbf357007f7909d98950956f7ce
+
 }