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

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

@@ -35,7 +35,8 @@ public class SessionInterceptor extends HandlerInterceptorAdapter {
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
         HandlerMethod hm = (HandlerMethod) handler;
         String requestUrl = "" + request.getRequestURL();
-        if(!requestUrl.contains("/api/v1/bp/bpLogin") && !requestUrl.contains("/api/v1/uc/getAppVersion") && (request.getAttribute("userId")==null || request.getAttribute("userName")==null)){
+        if(!requestUrl.contains("/api/v1/bp/bpLogin") && !requestUrl.contains("/api/v1/uc/") && !requestUrl.contains("/api/v1/systemfiles/") && !requestUrl.contains("/api/v1/rms/insertPersonnel")
+                && (request.getAttribute("userId")==null || request.getAttribute("userName")==null)){
             //无权访问
             response.setCharacterEncoding("UTF-8");
             response.setContentType("application/json; charset=utf-8");

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

@@ -304,6 +304,14 @@ public class AMScontroller  extends BaseRESTfulController {
         return amsFeign.purchaseTrainPlanDelete(map);
     }
 
+
+    @ApiOperation(value = "采购火运计划批量删除接口", notes = "采购火运计划批量删除接口")
+    @PostMapping(value = "/purchaseTrainPlanBatchDel")
+    @LogAround(foreignKeys = {"transPlanId"},foreignKeyTypes = {"采购计划"})
+    public Map<String, Object> purchaseTrainPlanBatchDel(@RequestBody(required = false) Map<String ,Object> map) {
+        return amsFeign.purchaseTrainPlanBatchDel(map);
+    }
+
     @ApiOperation(value="同步销售订单")    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
     @PostMapping(value = "/saleOrderSync")
     @LogAround(foreignKeys = {"orderId"}, foreignKeyTypes = {"销售订单"})
@@ -970,4 +978,25 @@ public class AMScontroller  extends BaseRESTfulController {
     public Map<String, Object> readFixedNeedsExcel(MultipartFile file) throws Exception {
         return amsFeign.readFixedNeedsExcel(file);
     }
+
+    @ApiOperation("导入")
+    @PostMapping("/importTransPrice")
+    public Map<String, Object> importTransPrice(@RequestBody MultipartFile file,
+                                                    String userId,
+                                                    String userName) throws Exception {
+        Map<String, Object> map = new HashMap<>();
+        //获取Excel中包含的对象数组
+        List<Map<String, Object>> list = ExcelToolUtils.getExcelList(file, 0);
+        map.put("list", list);
+        map.put("setList",list);
+        map.put("userId",userId);
+        map.put("userName",userName);
+        return amsFeign.importTransPrice(map);
+    }
+
+    @ApiOperation("派车")
+    @PostMapping("/dispatch")
+    public Map<String, Object> dispatch() throws Exception {
+        return amsFeign.dispatch();
+    }
 }

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

@@ -550,6 +550,13 @@ public class TMSController extends BaseRESTfulController {
         return tmsFeign.updateTrainLoad(map);
     }
 
+    @ApiOperation(value = "删除火运装车", notes = "删除火运装车")
+    @PostMapping(value = "/deleteTrainLoad")
+    @LogAround(foreignKeys = {"transOrderId"},foreignKeyTypes = {"运输订单"})
+    public Map<String, Object> deleteTrainLoad(@RequestBody(required = false) Map<String ,Object> map) {
+        return tmsFeign.deleteTrainLoad(map);
+    }
+
     @ApiOperation(value = "修改火运装车序号")
     @PostMapping("/updateTrainLoadSeq")
     public Map<String, Object> updateTrainLoadSeq(@RequestBody(required = false) Map<String, Object> map){

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

@@ -376,7 +376,9 @@ public class UniversalController extends BaseRESTfulController {
         }
         byte[] stream1 = exportExcelFile(columnMaps, listMap);
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
-        String path = "/data/file/"+  map.get("userName") + "-" + simpleDateFormat.format(new Date()) + "-" + map.get("exclename").toString() + ".xlsx";
+        Random random = new Random();
+        String path = "/data/file/"+  map.get("userName") + "-" + simpleDateFormat.format(new Date()) + "-"
+                + map.get("exclename").toString()+ Util.RandomCreate(8) + ".xlsx";
         FileOutputStream outputStream1 = new FileOutputStream(new File(path));
         outputStream1.write(stream1);
         outputStream1.flush();

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

@@ -106,6 +106,9 @@ public interface AmsFeign {
     @PostMapping(value = "api/v1/ams/amstransplans/purchaseTrainPlanDelete")
     Map<String, Object> purchaseTrainPlanDelete(Map<String, Object> map);
 
+    @PostMapping(value = "api/v1/ams/amstransplans/purchaseTrainPlanBatchDel")
+    Map<String, Object> purchaseTrainPlanBatchDel(Map<String, Object> map);
+
     @PostMapping("api/v1/ams/amsorders/saleOrderSync")
     Map<String, Object> saleOrderSync(@RequestBody(required = false) Map<String, Object> map);
 
@@ -345,4 +348,11 @@ public interface AmsFeign {
 
 
     @PostMapping(value = "api/v1/ams/amsfixedneedss/readFixedNeedsExcel", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
-    Map<String, Object> readFixedNeedsExcel(MultipartFile file );}
+    Map<String, Object> readFixedNeedsExcel(MultipartFile file );
+
+    @PostMapping(value = "api/v1/ams/amstransprices/importTransPrice")
+    Map<String, Object> importTransPrice(Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/ams/amstransrequirements/dispatch")
+    Map<String, Object> dispatch();
+}

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

@@ -181,6 +181,9 @@ public interface TmsFeign {
     @PostMapping("api/v1/tms/tmsloadresults/updateTrainLoad")
     Map<String, Object> updateTrainLoad(@RequestBody(required = false) Map<String, Object> map);
 
+    @PostMapping("api/v1/tms/tmsloadresults/deleteTrainLoad")
+    Map<String, Object> deleteTrainLoad(@RequestBody(required = false) Map<String, Object> map);
+
     @PostMapping("api/v1/tms/tmsloadresults/updateTrainLoadSeq")
     Map<String, Object> updateTrainLoadSeq(Map<String, Object> map);
 

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

@@ -0,0 +1,20 @@
+package com.steerinfo.dil.util;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @Author zhangnan
+ * @Date 2021/5/26 8:59
+ * @Version 1.0
+ * 工具类
+ */
+public class Util {
+    public static String RandomCreate(int i) {
+        String str = "";
+        for (int k = 0; k < i; k++) {
+            str += (int) (Math.random() * 10);// [1-10)随机数 即0-9
+        }
+        return str;
+    }
+}

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

@@ -1,14 +0,0 @@
-package com.steerinfo.dil.util;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @Author zhangnan
- * @Date 2021/5/26 8:59
- * @Version 1.0
- * 工具类
- */
-public class util {
-
-}