西瓜

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>org.example</groupId>
     <artifactId>antai-api</artifactId>
-    <version>2.4</version>
+    <version>1.0</version>
 
     <parent>
         <groupId>org.springframework.boot</groupId>

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

@@ -273,15 +273,12 @@ public class AMScontroller {
     @LogAround(foreignKeys = {"priceId"}, foreignKeyTypes = {"承运合同"})
     @PostMapping("/")
     public Map<String, Object> insertTransPrice(@RequestBody(required = false) Map<String, Object> map) throws ParseException {
-
-        if (!map.isEmpty()) {
-            if (!map.get("priceDate").toString().isEmpty()) {
-                SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
-                Date priceDate = simpleDateFormat.parse(map.get("priceDate").toString());
-                map.put("priceDate", priceDate);
-            }
+        if (map.containsKey("priceDate")){
+            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+            Date priceDate = simpleDateFormat.parse(map.get("priceDate").toString());
+            map.put("priceDate", priceDate);
         }
-        map.put("insertUsername", map.get("userName").toString());
+
         return amsFeign.add(map);
     }
 

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

@@ -0,0 +1,126 @@
+package com.steerinfo.dil.controller;
+
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.steerinfo.dil.annotaion.LogAround;
+import com.steerinfo.dil.feign.AmsFeign;
+import com.steerinfo.dil.feign.EmsFeign;
+import com.steerinfo.dil.feign.RmsFeign;
+import com.steerinfo.dil.feign.TmsFeign;
+import com.steerinfo.dil.util.BaseRESTfulController;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.math.BigDecimal;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author luobang
+ * @create 2021-09-17 14:11
+ */
+
+@RestController
+@RequestMapping("${api.version}/ems")
+public class EMSController extends BaseRESTfulController {
+    @Autowired
+    private EmsFeign emsFeign;
+    @Autowired
+    private AmsFeign amsFeign;
+    @Autowired
+    private RmsFeign rmsFeign;
+
+
+    @ApiOperation(value = "新增详单明细")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @LogAround(foreignKeys = {"settlementId"}, foreignKeyTypes = {"新增详单明细"})
+    @PostMapping("/emsdetailsordersAdd")
+    public Map<String, Object> emsdetailsordersAdd(@RequestBody(required = false) Map<String, Object> map){
+
+        return emsFeign.emsdetailsordersAdd(map);
+    }
+
+    @ApiOperation(value = "新增账单明细")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @LogAround(foreignKeys = {"settlementId"}, foreignKeyTypes = {"新增详单明细"})
+    @PostMapping("/emssettlementordersAdd")
+    public Map<String, Object> emssettlementordersAdd(@RequestBody Map<String, Object> map){
+        return emsFeign.emssettlementordersAdd(map);
+    }
+
+    @ApiOperation(value = "修改详单明细")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @LogAround(foreignKeys = {"settlementId"}, foreignKeyTypes = {"新增详单明细"})
+    @PutMapping("/emsdetailsordersupdate/{id}")
+    public Map<String, Object> emsdetailsordersupdate(@PathVariable BigDecimal id,@RequestBody(required = false) Map<String, Object> map){
+        map.put("updateUsername", map.get("userName").toString());
+        return emsFeign.emsdetailsordersdelete(id,map);
+    }
+
+    @ApiOperation(value = "更新详单状态")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @LogAround(foreignKeys = {"settlementId"}, foreignKeyTypes = {"新增详单明细"})
+    @PutMapping("/emsdetailsordersdelete/{id}")
+    public Map<String, Object> emsdetailsordersdelete(@PathVariable BigDecimal id,@RequestBody(required = false) Map<String, Object> map){
+        map.put("updateUsername", map.get("userName").toString());
+        return emsFeign.emsdetailsordersupdate(id,map);
+    }
+
+    @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"),
+    })
+    @PostMapping(value = "/emssettlementordersList")
+    Map<String, Object> emssettlementordersList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                             Integer apiId,
+                                             Integer pageNum,
+                                             Integer pageSize
+    ) {
+        return emsFeign.emssettlementordersList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
+    }
+
+    @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"),
+    })
+    @PostMapping(value = "/emsdetailsordersList")
+    Map<String, Object> emsdetailsordersList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                             Integer apiId,
+                                             Integer pageNum,
+                                             Integer pageSize
+    ) {
+        return emsFeign.emsdetailsordersList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
+    }
+
+
+    @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);
+    }
+
+    @ApiOperation(value = "异常处理")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @LogAround(foreignKeys = {"settlementId"}, foreignKeyTypes = {"异常处理"})
+    @PostMapping("/abnormal")
+    public Map<String, Object> abnormal(@RequestBody(required = false) Map<String, Object> map){
+        return emsFeign.abnormal(map);
+    }
+
+}

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

@@ -1,7 +1,6 @@
 package com.steerinfo.dil.controller;
 
 import com.google.common.collect.Iterators;
-import com.steerinfo.dil.util.DataChange;
 import com.steerinfo.dil.util.FtpFileUtil;
 import com.steerinfo.dil.util.IDutils;
 import com.steerinfo.framework.controller.BaseRESTfulController;
@@ -49,12 +48,10 @@ public class SystemFileController extends BaseRESTfulController {
 
     @Autowired
     private FtpFileUtil ftpFileUtil;
-
+//同一个信息包含多个上传文件信息
     @PostMapping("/insertFile")
-    public RESTfulResult insertFile(String alternateFields1, @ModelAttribute MultipartFile[] file) {
-
+    public RESTfulResult insertFile(String fileuuid, @ModelAttribute MultipartFile[] file) {
         String filenames = "";
-
         for (int i = 0; i < file.length; i++) {
             filenames += file[i].getOriginalFilename() + ";";
         }
@@ -79,7 +76,7 @@ public class SystemFileController extends BaseRESTfulController {
                         SystemFile uploadFile = new SystemFile();
                         uploadFile.setFilename(oldName);
                         uploadFile.setFilepath(filePath + "/" + newName);
-                        uploadFile.setId(alternateFields1);
+                        uploadFile.setId(fileuuid);
                         SystemFile modela = systemFileService.add(uploadFile);
                         if (modela != null) {
                             filesid += "," + modela.getId();
@@ -99,6 +96,52 @@ public class SystemFileController extends BaseRESTfulController {
 
     }
 
+    @PostMapping("/insertFiles2")
+    public RESTfulResult insertFiles2(String[] fileuuid, @ModelAttribute MultipartFile[] file) {
+        String filenames = "";
+        for (int i = 0; i < file.length; i++) {
+            filenames += file[i].getOriginalFilename() + ";";
+        }
+        String filesid = "";
+        if (file != null) {
+            for (int i = 0; i < file.length; i++) {
+                try {
+                    //获取系统时间
+                    SimpleDateFormat simpleDateFormat = new SimpleDateFormat("/yyyy/MM/dd");
+                    //获取文件名
+                    String oldName = file[i].getOriginalFilename();
+                    //取当前时间的长整形值包含毫秒
+                    String newName = IDutils.getImageName();
+                    //重新命名文件
+                    newName = newName + oldName.substring(oldName.lastIndexOf("."));
+                    String filePath = simpleDateFormat.format(new Date());
+                    //获取输入流
+                    InputStream inputStream = file[i].getInputStream();
+                    boolean result = ftpFileUtil.uploadToFtp(inputStream, filePath, newName, false);
+                    inputStream.close();
+                    if (result) {
+                        SystemFile uploadFile = new SystemFile();
+                        uploadFile.setFilename(oldName);
+                        uploadFile.setFilepath(filePath + "/" + newName);
+                        uploadFile.setId(fileuuid[i]);
+                        SystemFile modela = systemFileService.add(uploadFile);
+                        if (modela != null) {
+                            filesid += "," + modela.getId();
+                        }
+                    } else {
+                        return failed(null, "上传文件失败");
+                    }
+                } catch (Exception e) {
+                    e.getMessage();
+                }
+            }
+            return success(filesid);
+
+        } else {
+            return failed();
+        }
+
+    }
     @PostMapping("/insertFiles")
     public RESTfulResult insertFiles(String[] fileUuids,String[] fileNames,String[]fileTypes, Map<Object,MultipartFile>FileList, MultipartRequest request) throws Exception {
 

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

@@ -157,6 +157,30 @@ public class TMSController extends BaseRESTfulController {
         return tmsFeign.syncWeightResult(map);
     }
 
+    @ApiOperation(value="计时")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @PostMapping(value = "/startend")
+    @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);
+    }
+
+    @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) {
+        return tmsFeign.tmstimingresultsUpdate(map);
+    }
 
     @ApiOperation(value="销售派发运输订单")
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")

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

@@ -0,0 +1,58 @@
+package com.steerinfo.dil.feign;
+
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @ author    :TXF
+ * @ time      :2021/9/28 9:30
+ */
+
+@FeignClient(name = "ANTAI-EMS-API", url = "${openfeign.EmsFeign.url}")
+public interface EmsFeign {
+
+    //======================>车辆综合实绩
+
+    @PostMapping("api/v1/ems/emsdetailsorders/emsdetailsordersAdd")
+    Map<String, Object> emsdetailsordersAdd(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping("api/v1/ems/emssettlementorders/emssettlementordersAdd")
+    Map<String, Object> emssettlementordersAdd(@RequestBody Map<String, Object> map);
+    @PutMapping("api/v1/ems/emsdetailsorders/emsdetailsordersupdate/{id}")
+    Map<String, Object> emsdetailsordersupdate(@PathVariable BigDecimal id,@RequestBody(required = false) Map<String, Object> map);
+
+
+    @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);
+
+
+
+    @PutMapping("api/v1/ems/emsdetailsorders/emsdetailsordersdelete/{id}")
+    Map<String, Object> emsdetailsordersdelete(@PathVariable BigDecimal id,@RequestBody(required = false) Map<String, Object> map);
+
+
+    @PostMapping("api/v1/ems/emsdetailsorders/emsdetailsordersList")
+    Map<String, Object> emsdetailsordersList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                             @RequestParam Integer apiId,
+                                             @RequestParam Integer pageNum,
+                                             @RequestParam Integer pageSize
+    );
+    @PostMapping("api/v1/ems/emssettlementorders/emssettlementordersList")
+    Map<String, Object> emssettlementordersList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                             @RequestParam Integer apiId,
+                                             @RequestParam Integer pageNum,
+                                             @RequestParam Integer pageSize
+    );
+}
+
+
+
+
+
+

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

@@ -66,6 +66,19 @@ public interface TmsFeign {
     Map<String, Object> syncWeightResult(Map<String, Object> map);
 
 
+    @PostMapping("api/v1/tms/tmstimingresults/startend")
+    Map<String, Object> startend(Map<String, Object> map);
+
+    @PostMapping("api/v1/tms/tmstimingresults/tmstimingresultsUpdate")
+    Map<String, Object> tmstimingresultsUpdate(Map<String, Object> map);
+
+
+    @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);
 
@@ -75,6 +88,7 @@ public interface TmsFeign {
                                           @RequestParam  Integer pageNum,
                                           @RequestParam  Integer pageSize);
 
+
     @PostMapping("api/v1/tms/tmsqualityresults/syncQualityResult")
     Map<String, Object> syncQualityResult(Map<String, Object> map);
 

src/main/resources/application-dev.yml

@@ -51,11 +51,13 @@ openfeign:
   OMSFeign:
     url: ${OMSFEIGN_URL:localhost:8095}
   RmsFeign:
-    url: ${RMSFEIGN_URL:172.16.90.214:8060}
+    url: ${RMSFEIGN_URL:localhost:8060}
   IntegrationFeign:
     url: ${INTEGRATIONFEIGN_URL:localhost:8066}
   OTMSFeign:
     url: ${OTMSFEIGN_URL:localhost:8038}
+  EmsFeign:
+    url: ${TMSFEIGN_URL:localhost:8096}
 
 
 #远程调用

src/main/resources/application-prod.yml

@@ -40,6 +40,8 @@ openfeign:
     url: ${INTEGRATIONFEIGN_URL:172.16.90.214:8066}
   OTMSFeign:
     url: ${OTMSFEIGN_URL:172.16.90.214:8038}
+  EmsFeign:
+    url: ${TMSFEIGN_URL:172.16.90.214:8096}
 
 
 #远程调用