Merge branch 'master' of https://gitee.com/antai-wuliu/ANTAI-API

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

@@ -10,5 +10,5 @@ import java.lang.annotation.*;
 @Documented
 public @interface RequestLimit {
     int seconds() default 1;//秒
-    int maxCount() default 1;//最大访问次数
+    int maxCount() default 100;//最大访问次数
 }

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

@@ -44,7 +44,7 @@ public class RepeatRequestIntercept extends HandlerInterceptorAdapter {
                 //判断是否超过最大限定请求次数
                 if (requestCount < max) {
                     //未超过则请求次数+1
-                    redisUtils.incr(key, 1);
+                    redisUtils.incr(key, 100);
                 } else {
                     //否则拒绝请求并返回信息
                     refuse(response);

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

@@ -148,7 +148,7 @@ public class EMSController extends BaseRESTfulController {
                                              Integer pageNum,
                                              Integer pageSize
     ) {
-        return emsFeign.emsdetailsordersList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
+        return emsFeign.emssalarydetailsList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
     }
 
     @ApiOperation(value = "新增详单明细")

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

@@ -190,6 +190,7 @@ public class TMSController extends BaseRESTfulController {
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
     @PostMapping(value = "/startend")
     @LogAround(foreignKeys = {"resultId"}, foreignKeyTypes = {"计时"})
+    @RequestLimit
     public Map<String, Object> start(@RequestBody(required = false) Map<String, Object> map) {
         return tmsFeign.startend(map);
     }

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

@@ -15,7 +15,7 @@ import java.nio.charset.StandardCharsets;
 import java.util.*;
 
 
-//导入excle工具类
+//导出excle工具类
 
 public class poiutil {
     private final static String xls = "xls";

src/main/resources/application-dev.yml

@@ -51,7 +51,7 @@ openfeign:
   OMSFeign:
     url: ${OMSFEIGN_URL:172.16.90.214:8095}
   RmsFeign:
-    url: ${RMSFEIGN_URL:172.16.90.214:8060}
+    url: ${RMSFEIGN_URL:localhost:8060}
   IntegrationFeign:
     url: ${INTEGRATIONFEIGN_URL:localhost:8066}
   OTMSFeign: